More user profile cleanup