Update tracking to clean up page vars