Revert "Cleanup"

This reverts commit b3e64564b7cf69f9cc1763ba3c9b7f96f2828017.