Remove cruft & add dms scaffold