Clean up the user model to prep for ch6