Revert "Cleanup"

This reverts commit 8de6847f15ce764a697e5f763741c69e3457e4df.