Revert "Cleanup"

This reverts commit c5d3c79ba75e0d4a396b22f55abac08edb8cf455.