Revert "more cleanup"

This reverts commit a30cec2ab9152cad7cca1629820dee86505686f1.