Refactored detach VPN