Refactoring. Removing username from User model in favor of email