Revert "more cleanup"

This reverts commit 08140445e5ece451d32004569d90cdc1ac66d7cc.