Clean up the UserController