XXX some dbdma cleanup