Removed unused code
p4#: 21354