removed client unit test and clean up