Removed old template code