Cleaned User model file