Removed old client api, fixes #35