remove ClientServer
revert tests