drc: some more general cleanup