Revert "Cleanup"

This reverts commit 7e4a93901212bbe942a15f0db90073a9ee1cea3c.