A little cleanup for #dm