Cleaner state machines