#2702 -- remove old code