Removed obsolete code
p4#: 20857