diff --git a/assets/scripts/app/controllers/current_user.coffee b/assets/scripts/app/controllers/current_user.coffee
index affccf9c..4b8ca9e4 100644
--- a/assets/scripts/app/controllers/current_user.coffee
+++ b/assets/scripts/app/controllers/current_user.coffee
@@ -1,19 +1,11 @@
-delegate = (name, options) ->
-  options ||= options
-  ->
-    target = @get(options.to)
-    target[name].apply(target, arguments)
-
 Travis.CurrentUserController = Em.ObjectController.extend
   sync: ->
-    @get('content').sync()
+    @get('model').sync()
 
-  content: (->
-    @get('auth.currentUser')
-  ).property('auth.currentUser')
+  model: Ember.computed.alias('auth.currentUser')
 
   syncingDidChange: (->
-    if (user = @get('content')) && user.get('isSyncing') && !user.get('syncedAt')
+    if (user = @get('model')) && user.get('isSyncing') && !user.get('syncedAt')
       Ember.run.scheduleOnce 'routerTransitions', this, ->
         @container.lookup('router:main').send('renderFirstSync')
-  ).observes('isSyncing', 'content')
+  ).observes('isSyncing', 'auth.currentUser')
diff --git a/assets/scripts/app/controllers/flash.coffee b/assets/scripts/app/controllers/flash.coffee
index 721b629f..9b857656 100644
--- a/assets/scripts/app/controllers/flash.coffee
+++ b/assets/scripts/app/controllers/flash.coffee
@@ -6,13 +6,13 @@ Travis.FlashController = Ember.ArrayController.extend
     @_super.apply this, arguments
     @set('flashes', Travis.LimitedArray.create(limit: 2, content: []))
 
-  content: (->
+  model: (->
     broadcasts = @get('unseenBroadcasts')
     flashes = @get('flashes')
-    content = []
-    content = content.concat(broadcasts.toArray()) if broadcasts
-    content = content.concat(flashes.toArray().reverse())    if flashes
-    content.uniq()
+    model = []
+    model = model.concat(broadcasts.toArray()) if broadcasts
+    model = model.concat(flashes.toArray().reverse())    if flashes
+    model.uniq()
   ).property('unseenBroadcasts.length', 'flashes.length')
 
   unseenBroadcasts: (->