remove StreamClientId and update code and tests accordingly