cleaned user model + controllers