removed datapath