Fixed: disabled cleaners