diff --git a/app/components/env-var.coffee b/app/components/env-var.coffee
index 1dbe3435..61acca7e 100644
--- a/app/components/env-var.coffee
+++ b/app/components/env-var.coffee
@@ -5,7 +5,6 @@ EnvVarComponent = Ember.Component.extend
   classNames: ['settings-envvar']
   classNameBindings: ['envVar.public:is-public']
 
-  isEditing: false
   isDeleting: false
 
   validates:
@@ -25,24 +24,6 @@ EnvVarComponent = Ember.Component.extend
     delete: ->
       return if @get('isDeleting')
       @set('isDeleting', true)
-
-      @get('model').destroyRecord()
-
-    edit: ->
-      @set('isEditing', true)
-
-    cancel: ->
-      @set('isEditing', false)
-      @get('model').revert()
-
-    save: ->
-      return if @get('isSaving')
-
-      if @isValid()
-        env_var = @get('model')
-
-        # TODO: handle errors
-        env_var.save().then =>
-          @set('isEditing', false)
+      @get('envVar').destroyRecord()
 
 `export default EnvVarComponent`
diff --git a/app/templates/components/add-env-var.hbs b/app/templates/components/add-env-var.hbs
index a5c97428..9bae2cc6 100644
--- a/app/templates/components/add-env-var.hbs
+++ b/app/templates/components/add-env-var.hbs
@@ -12,39 +12,10 @@
     {{travis-switch active=public}}
   </div>
   <div class="form-elem">
-    <input type="submit" value="Add" class="form-submit {{if isSaving "saving"}}" disabled={{isSaving}} />
+    {{#if isSaving}}
+      {{loading-indicator}}
+    {{else}}
+      <input type="submit" value="Add" class="form-submit" />
+    {{/if}}
   </div>
 </form>
-
-{{!-- 
-
-
-<form class="env-var" {{action "save" on="submit"}}>
-  {{#travis-field "name"}}
-    
-    {{input value=name class="env-name" placeholder="Name"}} {{travis-errors "name"}}
-  {{/travis-field}}
-  <span class="equals">=</span>
-  {{#if showValueField}}
-    <div class="field value value--extra">
-      {{#label for="value" class="value"}}Value:{{/label}}
-      {{input value=value class="env-value" placeholder="Value"}}
-    </div>
-  {{else}}
-    <div class="field name">
-      <span class="value value-display secure">{{value}}</span>
-    </div>
-  {{/if}}
-  <div class="field field--switch">
-    {{travis-switch active=public}}
-    {{#label for="secure" class="public"}}Display value in build logs{{/label}}
-  </div>
-
-  <div class="actions">
-    <input type="submit" {{bind-attr value=actionType class=":submit-env-var isSaving:saving" disabled=isSaving}} />
-    <span class="or">or</span>
-    <a href="#" class="cancel-env-var" {{action "cancel"}}>Cancel</a>
-  </div>
-</form>
-
- --}}
\ No newline at end of file
diff --git a/app/templates/components/env-var.hbs b/app/templates/components/env-var.hbs
index 5a260f16..e9c86e34 100644
--- a/app/templates/components/env-var.hbs
+++ b/app/templates/components/env-var.hbs
@@ -5,9 +5,13 @@
 </div>
 <div class="env-var-action">
   <div class="tooltip">
-    <a href="#" title="">
-      <span class="icon-delete"></span>
-    </a>
-    <div class="tooltip-bubble">Delete</div>
+    {{#if isDeleting}}
+      {{loading-indicator}}
+    {{else}}
+      <a href="#" title="" {{action "delete" on="click"}}>
+        <span class="icon-delete"></span>
+      </a>
+      <div class="tooltip-bubble">Delete</div>
+    {{/if}}
   </div>
 </div>