Some improvements
Remove UserProfile On User