Removed unnecessary code from User class