Revert "Cleanup"

This reverts commit 7809e6e7727a264e01f1089ab02c111e1834adab.