More DFM cleanup