If you do cleanup check you don't break things