Beginning stripdown to just tunnel service