more verification when clean (refs #4035)