Removed obsolete code
p4#: 21328