Revert "more clean up"

This reverts commit 817e2168afb2475fee160dc6dc8499ec6993a197.