Revert "Cleanup"

This reverts commit 67e4aa4d0b42c2c8aa07f9913a66356b83a4096e.