Remove unused methods
Update UserController for Rails 4