Revert "Cleanup"

This reverts commit 074fe8227215e21df27acc8260fd260b7843c9af.