Remove diversity-and-equality