Partially Revert "Cleanup"

This reverts commit 43e7084074172a0bd3bce274032eda326bf70a1a.