fixed remove for port forwarder. still needs fixing for refresh