Revert "more cleanup"
oops

This reverts commit 3689deb3aeca147db327d9688347d655beaeb18b.