diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 4416bf5c01a..b020cf50c98 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -52,11 +52,6 @@ Discourse.Composer = Discourse.Model.extend({
   canEditTitle: Em.computed.or('creatingTopic', 'creatingPrivateMessage', 'editingFirstPost'),
   canCategorize: Em.computed.and('canEditTitle', 'notCreatingPrivateMessage'),
 
-  showAdminOptions: function() {
-    if (this.get('creatingTopic') && Discourse.User.currentProp('staff')) return true;
-    return false;
-  }.property('canEditTitle'),
-
   // Determine the appropriate title for this action
   actionTitle: function() {
     var topic = this.get('topic');
diff --git a/app/assets/javascripts/discourse/templates/composer.js.handlebars b/app/assets/javascripts/discourse/templates/composer.js.handlebars
index 9a7b7d7d04a..8a77881d392 100644
--- a/app/assets/javascripts/discourse/templates/composer.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/composer.js.handlebars
@@ -48,16 +48,9 @@
               {{#if model.archetype.hasOptions}}
                 <button class='btn' {{action showOptions}}>{{i18n topic.options}}</button>
               {{/if}}
-              {{#if model.showAdminOptions}}
-                <button {{action toggleAdminOptions target="view"}} class="btn no-text show-admin-options" title='{{i18n composer.admin_options_title}}'><i class="fa fa-wrench"></i></button>
-              {{/if}}
               {{render additionalComposerButtons model}}
             {{/unless}}
           </div>
-
-          <div class="admin-options-form">
-            {{auto-close-form autoCloseTime=model.auto_close_time}}
-          </div>
         {{/if}}
 
         <div class='wmd-controls'>