removed template references