removed username from User model