Revert "Revert "clean stuff""

This reverts commit 6b24480213981b68d18fadeb8322635857fd7aad.