remove some commented code

Between this and f49686ec3968395f0c0c701eae31e16ab66352e5, for
Pivotal, [Fixes #74111652]