dma.cpp - cleanups