Revert "Revert "Cleanup""

This reverts commit 841aa9692292fdaec76bce86f599676af3e3c8a8.