Revert "Revert "cleanup""

This reverts commit 662db997c4b9b32747150c4bddf148675034f4fd.