User model relation cleanup