Update code to do a remove on ALL sockets