dcc: cleanups