User model cleanup