fix lingering DSF code issues