Revert "Cleanup"

This reverts commit cf05079cbde566b43e685c94a44a641b28745b03.