Removed old template stuff