diff --git a/packages/hurl_core/src/error/mod.rs b/packages/hurl_core/src/error/mod.rs
index 0197b010d14..1a64f4010e4 100644
--- a/packages/hurl_core/src/error/mod.rs
+++ b/packages/hurl_core/src/error/mod.rs
@@ -66,9 +66,6 @@ impl Error for parser::Error {
             ParseError::Version => "Parsing version".to_string(),
             ParseError::XPathExpr => "Parsing XPath expression".to_string(),
             ParseError::Xml => "Parsing XML".to_string(),
-            // TODO: implement all variants
-            // _ => ,
-            ParseError::Url => format!("{self:?}"),
         }
     }
 
@@ -173,9 +170,6 @@ impl Error for parser::Error {
             }
             ParseError::XPathExpr => "expecting a XPath expression".to_string(),
             ParseError::Xml => "invalid XML".to_string(),
-            // TODO: implement all variants
-            // _ => format!("{self:?}"),
-            ParseError::Url => format!("{self:?}"),
         }
     }
 }
diff --git a/packages/hurl_core/src/parser/error.rs b/packages/hurl_core/src/parser/error.rs
index 07c5d0c9fe6..6f6004377a4 100644
--- a/packages/hurl_core/src/parser/error.rs
+++ b/packages/hurl_core/src/parser/error.rs
@@ -52,7 +52,6 @@ pub enum ParseError {
     Status,
     TemplateVariable,
     Unicode,
-    Url,
     UrlIllegalCharacter(char),
     UrlInvalidStart,
     Version,
diff --git a/packages/hurl_core/src/parser/expr.rs b/packages/hurl_core/src/parser/expr.rs
index 68267a6be6a..d0febf74b6f 100644
--- a/packages/hurl_core/src/parser/expr.rs
+++ b/packages/hurl_core/src/parser/expr.rs
@@ -22,14 +22,11 @@ use crate::parser::reader::Reader;
 use crate::parser::ParseResult;
 
 pub fn parse(reader: &mut Reader) -> ParseResult<Expr> {
-    // let start = p.state.clone();
-
     try_literal("{{", reader)?;
     let space0 = zero_or_more_spaces(reader)?;
     let variable = variable_name(reader)?;
     let space1 = zero_or_more_spaces(reader)?;
 
-    //literal("}}", p)?;
     if try_literal("}}}", reader).is_err() {
         literal("}}", reader)?
     }
@@ -42,8 +39,6 @@ pub fn parse(reader: &mut Reader) -> ParseResult<Expr> {
 }
 
 pub fn parse2(reader: &mut Reader) -> ParseResult<Expr> {
-    // let start = p.state.clone();
-
     let space0 = zero_or_more_spaces(reader)?;
     let variable = variable_name(reader)?;
     let space1 = zero_or_more_spaces(reader)?;
diff --git a/packages/hurl_core/src/parser/url.rs b/packages/hurl_core/src/parser/url.rs
index f47199536b9..bcefefab66d 100644
--- a/packages/hurl_core/src/parser/url.rs
+++ b/packages/hurl_core/src/parser/url.rs
@@ -28,14 +28,6 @@ pub fn url(reader: &mut Reader) -> ParseResult<Template> {
     let mut elements = vec![];
     let mut buffer = String::new();
 
-    if reader.is_eof() {
-        return Err(Error {
-            pos: start.pos,
-            recoverable: false,
-            inner: ParseError::Url,
-        });
-    }
-
     if !url_prefix_valid(reader) {
         return Err(Error {
             pos: reader.state.pos,
@@ -91,6 +83,7 @@ pub fn url(reader: &mut Reader) -> ParseResult<Template> {
             }
         }
     }
+
     if !buffer.is_empty() {
         elements.push(TemplateElement::String {
             value: buffer.clone(),
@@ -98,15 +91,6 @@ pub fn url(reader: &mut Reader) -> ParseResult<Template> {
         });
     }
 
-    if elements.is_empty() {
-        reader.state = start;
-        return Err(Error {
-            pos: start.pos,
-            recoverable: false,
-            inner: ParseError::Url,
-        });
-    }
-
     // URLs should be followed by a line terminator
     let save = reader.state;
     if line_terminator(reader).is_err() {