diff --git a/web-service/src/index.js b/web-service/src/index.js
index 092cd7b8064d09d293bbbcc85c38157cd43ff4d2..f4096ecdcb17b32510a3baa6e74245771a49e02f 100644
--- a/web-service/src/index.js
+++ b/web-service/src/index.js
@@ -69,13 +69,11 @@ RGBDStream.prototype.pushFrames = function(rgb, depth) {
 	this.depth = depth;
 
 	for (let i=0; i < this.clients.length; i++) {
-		console.log("Push frame");
 		this.clients[i].push(this.uri, rgb, depth);
 	}
 
 	let i=0;
 	while (i < this.clients.length) {
-		console.log("TX COUNT", this.clients[i].txmax);
 		if (this.clients[i].txcount >= this.clients[i].txmax) {
 			console.log("remove client");
 			this.clients.splice(i, 1);
@@ -220,13 +218,7 @@ app.ws('/', (ws, req) => {
 		//uri_to_peer[streams[i]] = peer;
 		peer_uris[p.string_id].push(uri);
 
-		uri_data[uri] = {
-			peer: p,
-			title: "",
-			rgb: null,
-			depth: null,
-			pose: null
-		};
+		uri_data[uri] = new RGBDStream(uri, p);
 
 		broadcastExcept(p, "add_stream", uri);
 	});