SocketDaemon remove function changed