Merge "Remove refernces to V1 API, as V2 doesn't exist anymore."