Revert "Revert "..clean up""

This reverts commit 3b2cf9f24d318c05fc34347c98a35b7d10a1f793.