Revert "cleanups"

This reverts commit b3a50f946b1cc1ff0976144e34b9929296b76287.