drc: some cleanup