remove shared -> client dependency, fix client