Revert "Revert "cleaning""

This reverts commit a8ad4ccb21da62ace6a52495da224991683cd7a1.