Minor VXLAN/GRE Tunnel Encap Optimization and Cleanup