diff --git a/sqrl-planner/src/main/java/com/datasqrl/planner/parser/SqlScriptStatementSplitter.java b/sqrl-planner/src/main/java/com/datasqrl/planner/parser/SqlScriptStatementSplitter.java
index 20cb627c9..0cdaac01b 100644
--- a/sqrl-planner/src/main/java/com/datasqrl/planner/parser/SqlScriptStatementSplitter.java
+++ b/sqrl-planner/src/main/java/com/datasqrl/planner/parser/SqlScriptStatementSplitter.java
@@ -183,13 +183,8 @@ private static ParsedLine parseLine(
       }
 
       if (!inStringLiteral && startsBlockComment(line, i)) {
-        if (startsDocComment(line, i) || startsHintComment(line, i)) {
-          inPreservedBlockComment = true;
-          parsed.append(line.charAt(i));
-        } else {
-          inBlockComment = true;
-          i++;
-        }
+        inPreservedBlockComment = true;
+        parsed.append(line.charAt(i));
         continue;
       }
 
diff --git a/sqrl-testing/sqrl-testing-integration/src/test/resources/dagplanner/subProject/sources.sqrl b/sqrl-testing/sqrl-testing-integration/src/test/resources/dagplanner/subProject/sources.sqrl
index cdd05a462..403fc9c13 100644
--- a/sqrl-testing/sqrl-testing-integration/src/test/resources/dagplanner/subProject/sources.sqrl
+++ b/sqrl-testing/sqrl-testing-integration/src/test/resources/dagplanner/subProject/sources.sqrl
@@ -1,7 +1,12 @@
+-- this is frontmatter that's ignored
+
+/** This is the customer table */
 /*+no_query */
 CREATE TABLE Customer (
+    /** This is the timestamp */
     `timestamp` AS COALESCE(TO_TIMESTAMP_LTZ(lastUpdated, 0), TIMESTAMP '1970-01-01 00:00:00.000'),
     PRIMARY KEY (customerid, lastUpdated) NOT ENFORCED,
+    /* we expect the input kafka topic to be monotonically sorted */
     WATERMARK FOR `timestamp` AS `timestamp` - INTERVAL '0.001' SECOND
 ) WITH (
     'format' = 'flexible-json',
diff --git a/sqrl-testing/sqrl-testing-integration/src/test/resources/usecases/analytics-only/analytics-only.sqrl b/sqrl-testing/sqrl-testing-integration/src/test/resources/usecases/analytics-only/analytics-only.sqrl
index 236f71a9b..b19a138b7 100644
--- a/sqrl-testing/sqrl-testing-integration/src/test/resources/usecases/analytics-only/analytics-only.sqrl
+++ b/sqrl-testing/sqrl-testing-integration/src/test/resources/usecases/analytics-only/analytics-only.sqrl
@@ -7,7 +7,7 @@ _LoanTypes := DISTINCT sources.LoanTypesStream ON id ORDER BY updated_at DESC;
 /** Status of an Application */
 /*+primary_key(customer_id) */
 /*+partition_key(customer_id) */
-ApplicationStatus := SELECT u.status, u.message, u.event_time, a.id, a.customer_id, a.loan_type_id,
+ApplicationStatus := SELECT u.status, u.message, u.event_time /* need to keep this */, a.id, a.customer_id, a.loan_type_id,
                             a.amount, a.duration, t.max_amount, t.min_amount
                      FROM sources.ApplicationUpdates u JOIN _Applications FOR SYSTEM_TIME AS OF u.`event_time` a ON a.id = u.loan_application_id
                                                JOIN _LoanTypes FOR SYSTEM_TIME AS OF u.`event_time` t ON t.id = a.loan_type_id;