First step on new cleaner.
Debugging enabled for cleaner