Revert "Cleanup"

This reverts commit 794e333aa1899f3688c3e4561f84663f8003453b.