all current tests pass. fixed overzealous cleaning & non-cleaning logic.