Removed user helper from UsersController
Removed flash messages for re-renders
Cleaned up files for merge