Revert "more cleanup"

This reverts commit 2190d5cffa9cc84749d97f64aea797f57e9b8294.
Let's see