Revert "Cleanup"

This reverts commit 7713249186429fcc74b0061fe8a2826e27ecc900.