Revert "Cleanup"

This reverts commit c08308bf61aaf669b00533409cb0daaa10c000aa.