Clean up user model