Removed the template comments