diff --git a/public/js/controllers/groupsCtrl.js b/public/js/controllers/groupsCtrl.js
index 793698d465..43602234da 100644
--- a/public/js/controllers/groupsCtrl.js
+++ b/public/js/controllers/groupsCtrl.js
@@ -306,10 +306,6 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
   .controller("TavernCtrl", ['$scope', 'Groups', 'User',
     function($scope, Groups, User) {
       $scope.group = Groups.tavern();
-      $scope.rest = function(){
-        User.user.flags.rest = !User.user.flags.rest;
-        User.log({op:'set',data:{'flags.rest':User.user.flags.rest}});
-      }
       $scope.toggleUserTier = function($event) {
         $($event.target).next().toggle();
       }
diff --git a/public/js/controllers/tasksCtrl.js b/public/js/controllers/tasksCtrl.js
index 81759ce21f..fe4bb3641c 100644
--- a/public/js/controllers/tasksCtrl.js
+++ b/public/js/controllers/tasksCtrl.js
@@ -91,11 +91,6 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
       }
     };
 
-    $scope.clearCompleted = function() {
-      User.user.todos = _.reject(User.user.todos, {completed:true});
-      User.log({op: 'clear-completed'});
-    }
-
 
     /*
      ------------------------
diff --git a/src/controllers/user.js b/src/controllers/user.js
index 68d9c2da1f..c66d3ff29e 100644
--- a/src/controllers/user.js
+++ b/src/controllers/user.js
@@ -169,15 +169,6 @@ api.sortTask = function(req, res, next) {
   })
 };
 
-api.clearCompleted = function(req, res, next) {
-  var user = res.locals.user;
-  user.todos = _.where(user.todos, {completed: false});
-  return user.save(function(err, saved) {
-    if (err) return res.json(500, {err: err});
-    return res.json(saved);
-  });
-};
-
 /*
   ------------------------------------------------------------------------
   Items
diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade
index bb2d2bf17c..820b3d16a1 100644
--- a/views/options/social/tavern.jade
+++ b/views/options/social/tavern.jade
@@ -13,7 +13,7 @@
               .popover-content
                 | Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (going on vacation? sudden illness?), I'll set you up at the inn - Dailies won't hurt you while you're resting.
                 div
-                  button.btn.btn-large.btn-success(ng-class='{active: user.flags.rest}', ng-click='rest()')
+                  button.btn.btn-large.btn-success(ng-class='{active: user.flags.rest}', ng-click='User.user.ops.sleep({})')
                     span(ng-show='user.flags.rest') Check Out of Inn
                     span(ng-hide='user.flags.rest') Rest in the Inn
     .alert.alert-info(ng-show='user.flags.rest')
diff --git a/views/shared/tasks/lists.jade b/views/shared/tasks/lists.jade
index 82ed6e93a7..545e2a3c1e 100644
--- a/views/shared/tasks/lists.jade
+++ b/views/shared/tasks/lists.jade
@@ -88,7 +88,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
 
         // Todo Tabs
         div(bo-if='main && list.type=="todo"', bo-class='{"tabbable tabs-below": list.type=="todo"}')
-          button.task-action-btn.tile.spacious.bright(ng-show='list.showCompleted', ng-click='clearCompleted()') Clear Completed
+          button.task-action-btn.tile.spacious.bright(ng-show='list.showCompleted', ng-click='user.ops.clearCompleted({})') Clear Completed
           // remaining/completed tabs
           ul.nav.nav-tabs
             li(ng-class='{active: !list.showCompleted}')