Cleaning up login model and user model