remove excess toEdit, add some infodiv's