Revert "Cleanup"

This reverts commit 4448a821fa9dae27f8caf51d137430fa9d3721e3.