cleanup before checkin