diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6
index c97c0d0ec15..2683d944fe6 100644
--- a/app/assets/javascripts/discourse/lib/computed.js.es6
+++ b/app/assets/javascripts/discourse/lib/computed.js.es6
@@ -103,17 +103,13 @@ export function endWith() {
   const args = Array.prototype.slice.call(arguments, 0);
   const substring = args.pop();
   const computed = Ember.computed(function() {
-    const self = this;
-    return _.every(
-      args.map(function(a) {
-        return self.get(a);
-      }),
-      function(s) {
+    return args
+      .map(a => this.get(a))
+      .every(s => {
         const position = s.length - substring.length,
           lastIndex = s.lastIndexOf(substring);
         return lastIndex !== -1 && lastIndex === position;
-      }
-    );
+      });
   });
   return computed.property.apply(computed, args);
 }
@@ -128,5 +124,5 @@ export function endWith() {
 export function setting(name) {
   return Ember.computed(function() {
     return Discourse.SiteSettings[name];
-  }).property();
+  });
 }