Revert "Cleanup"

This reverts commit 719e3ee0d6e99fa591cbd6baf162c332fd5466d7.