Change TCPInstance to handle removals better