Removed obsolete code and cleaned up interface
p4#: 22316