move verifyClean into CleanupUtils