#2702 -- remove more dead code