Got template to work and removed old references