Get rid of all pivot_table2 references