Refactor|Cleanup: Cleaning up the old DED sources