Continued cleanup of DDS.