Revert "Cleanup"

This reverts commit 81b6119d753e38a0232ed67162a399b07da94009.