some DBG() cleanup