openvpn patch cleanups