Remove DFP dependency