Removed some old references from template