Revert "Cleanup"

This reverts commit 387a3180393c0d02936b88b22b54738144ade2b3.