Revert "some cleanup"

This reverts commit 435bcab6f6d2a88edc72363945773ff2edd1aadd.