Revert "Cleanups"

This reverts commit f0c3bd1f82de4bb5eb89b46cbedfc8ad5b5ccb39.