diff --git a/.jshintrc b/.jshintrc
index 6c97bb92f..b5215d7b9 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -30,7 +30,6 @@
         "SimpleAuth": true,
         "validator": true,
         "ic": true,
-        "_": true,
         "NProgress": true,
         "moment": true
     }
diff --git a/README.md b/README.md
index cf3cbfd6f..8bc8f258c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
-# [Ghost-UI](http://github.com/TryGhost/Ghost-UI)
-[Travis] [SauceLabs]
+# Ghost Admin Client
 
-Ghost-UI is the Ember.js application used as a client-side admin for the [Ghost](http://ghost.org) blogging platform. This readme is a work in progress guide aimed at explaining the specific nuances of the Ghost Ember app to contributors whose main focus is on this side of things.
+Ember.js application used as a client-side admin for the [Ghost](http://ghost.org) blogging platform. This readme is a work in progress guide aimed at explaining the specific nuances of the Ghost Ember app to contributors whose main focus is on this side of things.
 
 
 ## Architecture
diff --git a/components/gh-notification.js b/components/gh-notification.js
index 64a504f25..3d94947ec 100644
--- a/components/gh-notification.js
+++ b/components/gh-notification.js
@@ -29,7 +29,6 @@ var NotificationComponent = Ember.Component.extend({
         var self = this;
 
         self.$().on('animationend webkitAnimationEnd oanimationend MSAnimationEnd', function (event) {
-            /* jshint unused: false */
             if (event.originalEvent.animationName === 'fade-out') {
                 self.notifications.removeObject(self.get('message'));
             }
diff --git a/controllers/forgotten.js b/controllers/forgotten.js
index 3b48b4043..dcc043310 100644
--- a/controllers/forgotten.js
+++ b/controllers/forgotten.js
@@ -1,4 +1,3 @@
-/* jshint unused: false */
 import ajax from 'ghost/utils/ajax';
 import ValidationEngine from 'ghost/mixins/validation-engine';
 
@@ -24,14 +23,14 @@ var ForgottenController = Ember.Controller.extend(ValidationEngine, {
                             email: data.email
                         }]
                     }
-                }).then(function (resp) {
+                }).then(function () {
                     self.toggleProperty('submitting');
                     self.notifications.showSuccess('Please check your email for instructions.', {delayed: true});
                     self.set('email', '');
                     self.transitionToRoute('signin');
                 }).catch(function (resp) {
                     self.toggleProperty('submitting');
-                    self.notifications.showAPIError(resp, {defaultErrorText: 'There was a problem logging in, please try again.'});
+                    self.notifications.showAPIError(resp, {defaultErrorText: 'There was a problem with the reset, please try again.'});
                 });
             }).catch(function (errors) {
                 self.toggleProperty('submitting');
diff --git a/controllers/reset.js b/controllers/reset.js
index b500b3911..3e342ec48 100644
--- a/controllers/reset.js
+++ b/controllers/reset.js
@@ -1,5 +1,3 @@
-/*global console*/
-/* jshint unused: false */
 import ajax from 'ghost/utils/ajax';
 import ValidationEngine from 'ghost/mixins/validation-engine';
 
diff --git a/router.js b/router.js
index d17127684..f0bbfd031 100644
--- a/router.js
+++ b/router.js
@@ -1,23 +1,18 @@
-/*global Ember */
-/* jshint unused: false */
 import ghostPaths from 'ghost/utils/ghost-paths';
 import documentTitle from 'ghost/utils/document-title';
 
-// ensure we don't share routes between all Router instances
-var Router = Ember.Router.extend();
-
-documentTitle();
-
-Router.reopen({
+var Router = Ember.Router.extend({
     location: 'trailing-history', // use HTML5 History API instead of hash-tag based URLs
     rootURL: ghostPaths().adminRoot, // admin interface lives under sub-directory /ghost
 
-    clearNotifications: function () {
+    clearNotifications: Ember.on('didTransition', function () {
         this.notifications.closePassive();
         this.notifications.displayDelayed();
-    }.on('didTransition')
+    })
 });
 
+documentTitle();
+
 Router.map(function () {
     this.route('setup');
     this.route('signin');