Not sure if we are leaking websockets and making app slower

Let's give a try