Revert "More cleaning up"

This reverts commit 4e0f3eacda744a3df008be3129b0caa3f7f39a88.
...