DN-MC6000MK2: Minor cleanup