Cleanup and changing Java driver version