Revert "more cleanups"

This reverts commit a4c32d919fd1aef1c69a0375219d03cd04b02371.
fixed previous revert