remove commented code, add CheckCleaningStage which should have been in
the previous commit