removed separate user model