Remove entities, update specs