Finally eliminated all templates