Cleanup some unneeded code
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  Cleanup some unneeded code