diff --git a/app/templates/env-vars/_form.hbs b/app/templates/env-vars/_form.hbs
deleted file mode 100644
index f7f25979..00000000
--- a/app/templates/env-vars/_form.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-<form class="env-var" {{action "save" on="submit"}}>
-  {{#travis-field "name"}}
-    {{#label for="name" class="name"}}Name:{{/label}}
-    {{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" value={{actionType}} class="submit-env-var {{if isSaving 'saving'}}" disabled={{isSaving}} />
-    <span class="or">or</span>
-    <a href="#" class="cancel-env-var" {{action "cancel"}}>Cancel</a>
-  </div>
-</form>
diff --git a/app/templates/env-vars/index.hbs b/app/templates/env-vars/index.hbs
deleted file mode 100644
index 04eb7bef..00000000
--- a/app/templates/env-vars/index.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{#link-to "env_vars.new" class="add-env-var"}}Add a new variable{{/link-to}}
diff --git a/app/templates/env-vars/new.hbs b/app/templates/env-vars/new.hbs
deleted file mode 100644
index 1afee20f..00000000
--- a/app/templates/env-vars/new.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{partial 'env_vars/form'}}
diff --git a/app/templates/helpers/travis-errors.hbs b/app/templates/helpers/travis-errors.hbs
deleted file mode 100644
index 394cd011..00000000
--- a/app/templates/helpers/travis-errors.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{#each view.errors as |error|}}{{error.message}}{{/each}}
diff --git a/app/templates/repo.hbs b/app/templates/repo.hbs
index c135e7ed..f92280cc 100644
--- a/app/templates/repo.hbs
+++ b/app/templates/repo.hbs
@@ -8,7 +8,7 @@
       <header>
         <h1 class="repo-title">{{#link-to "owner" repo.owner}}{{repo.owner}}{{/link-to}} / {{#link-to "repo" repo}}{{repo.name}}{{/link-to}}</h1>
         <div class="repo-gh">
-          <a href="{{controller.urlGithub}}" title="{{repo.name}} on Github">{{repo.name}} on Github</a>
+          <a href="{{urlGithub}}" title="{{repo.name}} on Github">{{repo.name}} on Github</a>
         </div>
         <div class="repo-badge">
           <a href="#" id="status-image-popup" title="build status image" name="status-images" class="open-popup" {{action "statusImages"}}>
diff --git a/app/templates/repos.hbs b/app/templates/repos.hbs
index 49946e5d..75026c0f 100644
--- a/app/templates/repos.hbs
+++ b/app/templates/repos.hbs
@@ -1,6 +1,6 @@
 <div class="search search--sidebar">
   <div class="search-inner">
-    {{input value=controller.search placeholder="Search all repositories"}}
+    {{input value=search placeholder="Search all repositories"}}
   </div>
 </div>
 
diff --git a/app/templates/ssh-key/_form.hbs b/app/templates/ssh-key/_form.hbs
deleted file mode 100644
index e7b0bb1c..00000000
--- a/app/templates/ssh-key/_form.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<form class="ssh-key" {{action "save" on="submit"}}>
-  <div class="field">
-    {{label for="description" content="Description:"}}
-    {{input value=description}}
-  </div>
-  {{#travis-field "value"}}
-    {{label for="value" class="value" content="Private key:"}}
-    {{textarea value=value}} {{travis-errors "value"}}
-  {{/travis-field}}
-
-  <div class="actions">
-    <input type="submit" value="Add" class="submit-ssh-key {{if isSaving 'saving'}}" {{if isSaving 'dsabled="disabled"'}} />
-    <span class="or">or</span>
-    <a href="#" class="cancel-ssh-key" {{action "cancel"}}>Cancel</a>
-  </div>
-</form>