Revert "Cleanup"

This reverts commit 0a360b854150dd74724c3bb89feb215734e4b107.