Revert "Revert "Cleanup""

This reverts commit 7565575187e17e99c7301adb07ccb4c14ff5b047.
Revert "...."

This reverts commit 4bdc3c9be70b7c8704eb4f477a783a203726d2e1.