Initial user model cleanup