[CLEANUP] UserController & AccountService