diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
index 0d5988a249..59a4e0b253 100644
--- a/core/Controller/LostController.php
+++ b/core/Controller/LostController.php
@@ -267,7 +267,7 @@ class LostController extends Controller {
 			\OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', array('uid' => $userId, 'password' => $password));
 
 			$this->config->deleteUserValue($userId, 'core', 'lostpassword');
-			@\OC_User::unsetMagicInCookie();
+			@\OC::$server->getUserSession()->unsetMagicInCookie();
 		} catch (\Exception $e){
 			return $this->error($e->getMessage());
 		}
diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php
index 7e7cbab3bc..036f59cf83 100644
--- a/lib/private/legacy/user.php
+++ b/lib/private/legacy/user.php
@@ -155,20 +155,6 @@ class OC_User {
 		}
 	}
 
-	/**
-
-	 * Try to login a user using the magic cookie (remember login)
-	 *
-	 * @deprecated use \OCP\IUserSession::loginWithCookie()
-	 * @param string $uid The username of the user to log in
-	 * @param string $token
-	 * @param string $oldSessionId
-	 * @return bool
-	 */
-	public static function loginWithCookie($uid, $token, $oldSessionId) {
-		return self::getUserSession()->loginWithCookie($uid, $token, $oldSessionId);
-	}
-
 	/**
 	 * Try to login a user, assuming authentication
 	 * has already happened (e.g. via Single Sign On).
@@ -233,7 +219,7 @@ class OC_User {
 
 			//setup extra user backends
 			self::setupBackends();
-			self::unsetMagicInCookie();
+			self::getUserSession()->unsetMagicInCookie();
 
 			return self::loginWithApache($backend);
 		}
@@ -381,17 +367,6 @@ class OC_User {
 		}
 	}
 
-	/**
-	 * Autogenerate a password
-	 *
-	 * @return string
-	 *
-	 * generates a password
-	 */
-	public static function generatePassword() {
-		return \OC::$server->getSecureRandom()->generate(30);
-	}
-
 	/**
 	 * Set password
 	 *
@@ -546,30 +521,6 @@ class OC_User {
 		return \OC::$server->getUserManager()->userExists($uid);
 	}
 
-	/**
-	 * disables a user
-	 *
-	 * @param string $uid the user to disable
-	 */
-	public static function disableUser($uid) {
-		$user = \OC::$server->getUserManager()->get($uid);
-		if ($user) {
-			$user->setEnabled(false);
-		}
-	}
-
-	/**
-	 * enable a user
-	 *
-	 * @param string $uid
-	 */
-	public static function enableUser($uid) {
-		$user = \OC::$server->getUserManager()->get($uid);
-		if ($user) {
-			$user->setEnabled(true);
-		}
-	}
-
 	/**
 	 * checks if a user is enabled
 	 *
@@ -585,23 +536,6 @@ class OC_User {
 		}
 	}
 
-	/**
-	 * Set cookie value to use in next page load
-	 *
-	 * @param string $username username to be set
-	 * @param string $token
-	 */
-	public static function setMagicInCookie($username, $token) {
-		self::getUserSession()->setMagicInCookie($username, $token);
-	}
-
-	/**
-	 * Remove cookie for "remember username"
-	 */
-	public static function unsetMagicInCookie() {
-		self::getUserSession()->unsetMagicInCookie();
-	}
-
 	/**
 	 * Returns the first active backend from self::$_usedBackends.
 	 *