Revert "Cleanup"

This reverts commit d9e5e6fc1fee086c0f0e90f6bc080226afb32abe.