Clean-up user.rb