removed instances of locales in current_user and user