Checkin-Checkout clean up