Revert "More cleanup"

This reverts commit fe31a98a89829c31e6a8d60a5dfa442326b93d11.