Revert "Revert "a few removals""

This reverts commit edea71900ffe8983edaf7b26511759320934e562.