Merge pull request from learneda/removing_socketListener removing the usage of the socket listeners on comments