removed template switch logic fromd default component template