began removing username from User model, use email instead