Revert "more clean-up"

This reverts commit 985a78bb0e3ed57805de58a7328ac52544b15742.
Revert "Revert "more clean-up""

This reverts commit 8cbe5bb3af2ef0b2243425ef682aa49d9da60fdc.
Revert to 985a78b