Clean up unused code in dmt