removed user settings, added fields to devise