Fix remove method in handler socket