Removed java.client dependancies