broke things down into separate methods and removed obsolete/duplicated stuff in users_controller and rake task