Revert "removal cleanup"

This reverts commit 238a611c1044a9bc1a9f2a34551f569d2e08ed11.
Revert "some more removals"

This reverts commit a4f6657854a1805ec687f25ffe864b4ec8f5c49e.
Revert "a few removals"

This reverts commit ecbc710f2dd163350d645782a0d68211bf89850e.