Revert "Cleanup"

This reverts commit 618f00b33b18e859c84c52f1abbd8201eb002006.