User model cleaned up