Revert "more cleanups"

This reverts commit 2ea4366477e647e8450c163df7d978c29465dece.
more cleanups