Removed old commented templates