Killed the old DFM finally