checkin cleanup