Revert "more cleanup"

This reverts commit fa5e3e2c20a090a0d7e4d23bc28905bbec2030cd.