Got rid of some useless DOs