remove all from client api and comment out tests