tunnels: initial tunnel type cleanup