Revert "Cleanup"

This reverts commit a9b1b034cd82c8d26340d334f7a5c4a120ae51e1.