Checkin before folder cleanup
b4 folder cleanup