Cleanup/3.x/client further cleanup

it should be checked