Removed template comments