Remove confusingly doubled-up navigation templates