Removing v1 logic
Integrate with the latest java client