clean up User model