remove polygon2 refs and updated index