REmoved some gratuitous usage of socket.io