Revert "Cleanup"

This reverts commit 4c0081d18fdb27c06ea28d4f3a13ca554ab02418.