UserProfile: little cleanup