Revert "clean up"

This reverts commit 83d799c3a3e0eda918c518e63ba0e19c233dbbed.
work in progress