More clean up for transition from user profile to custom user model