Revert "Cleanups"

This reverts commit dc433b56929e78a2a40bcf9ec2ecaef92e7149bd.