Cleanup of user profile fields. #857
Cleanup of user profile fields. #857