Revert "more removal"

This reverts commit 6b26a1b3d901da665b7f504469c6d58e86b44e9e.