Cleanup/3.x/client further cleanup