Clean up DDS loader code