Clean up DSP
Fix moved namespaces etc
Remove cruft