Implemented cleaning again