LUN-1070 -- removed unused code