Revert "more cleanup"

This reverts commit 7c349b11c6fcc0e6f86e56808feff065d4798db0.