[GEP-155] Remove all references to deprecated v2 API