Data Cleanup and fixed the java client

Still no luck with the data response