diff --git a/input/cql/IMMZD2DTMeaslesInput.cql b/input/cql/IMMZD2DTMeaslesInput.cql
index 0a35ddae16..714d459cb7 100644
--- a/input/cql/IMMZD2DTMeaslesInput.cql
+++ b/input/cql/IMMZD2DTMeaslesInput.cql
@@ -27,7 +27,7 @@ define "MCV Doses Administered to Patient":
 @psuedocode: Count of vaccines administered (where "Vaccine type" = 'Measles containing vaccines' and "Type of dose" = "Primary series" ) = 0
 */
 define "No measles primary series doses were administered":
-	not exists("MCV Doses Administered to Patient" I where I.occurrence after Patient.birthDate + 9 months)
+	not exists("MCV Doses Administered to Patient" I where difference in days between I.occurrence and Patient.birthDate + 9 months <= 0)
 
 /*
 @input: MCV0 was administered
@@ -48,37 +48,37 @@ define "MCV0 was not administered":
 @pseudocode: Count of vaccines administered (where "Vaccine type" = 'Measles containing vaccines' and "Type of dose" = "Primary series" ) = 1	
 */
 define "MCV1 was administered High Tx":
-	Count("MCV Doses Administered to Patient" I where I.occurrence after Patient.birthDate + 9 months) = 1
+	Count("MCV Doses Administered to Patient" I where difference in days between I.occurrence and Patient.birthDate + 9 months <= 0) = 1
 
 /*
 @input: MCV2 was administered High Tx
 @pseudocode: Count of vaccines administered (where "Vaccine type" = 'Measles containing vaccines' and "Type of dose" = "Primary series" ) = 2		
 */
 define "MCV2 was administered High Tx":
-	Count("MCV Doses Administered to Patient" I where I.occurrence after Patient.birthDate + 9 months) >= 2 
-	and Count("MCV Doses Administered to Patient" I where I.occurrence after Patient.birthDate + 15 months) >= 1
+	Count("MCV Doses Administered to Patient" I where difference in days between I.occurrence and Patient.birthDate + 9 months <= 0) >= 2 
+	and Count("MCV Doses Administered to Patient" I where difference in days between I.occurrence and Patient.birthDate + 15 months <= 0) >= 1
 
 /*
 @input: MCV1 was administered Low Tx
 @pseudocode: Count of vaccines administered (where "Vaccine type" = 'Measles containing vaccines' and "Type of dose" = "Primary series" ) = 1	
 */
 define "MCV1 was administered Low Tx":
-	Count("MCV Doses Administered to Patient" I where I.occurrence after Patient.birthDate + 12 months) = 1
+	Count("MCV Doses Administered to Patient" I where difference in days between I.occurrence and Patient.birthDate + 12 months <= 0) = 1
 
 /*
 @input: MCV2 was administered Low Tx
 @pseudocode: Count of vaccines administered (where "Vaccine type" = 'Measles containing vaccines' and "Type of dose" = "Primary series" ) = 2		
 */
 define "MCV2 was administered Low Tx":
-	Count("MCV Doses Administered to Patient" I where I.occurrence after Patient.birthDate + 12 months) >= 2 
-	and Count("MCV Doses Administered to Patient" I where I.occurrence after Patient.birthDate + 15 months) >= 1
+	Count("MCV Doses Administered to Patient" I where difference in days between I.occurrence and Patient.birthDate + 12 months <= 0) >= 2 
+	and Count("MCV Doses Administered to Patient" I where difference in days between I.occurrence and Patient.birthDate + 15 months <= 0) >= 1
 
 /*
 @input: Measles supplementary dose was administered
 @pseudocode: Count of vaccines administered (where "Vaccine type" = 'Measles containing vaccines' and "Type of dose" = "Supplementary dose") = 1
 */
 define "Measles supplementary dose was administered":
-	Count("MCV Doses Administered to Patient" I where I.occurrence after Patient.birthDate + 9 months) >= 3
+	Count("MCV Doses Administered to Patient" I where difference in days between I.occurrence and Patient.birthDate + 9 months <= 0) >= 3
 
 /*
 @input: Measles supplementary dose was not administered
diff --git a/input/cql/IMMZD2DTYellowFever.cql b/input/cql/IMMZD2DTYellowFever.cql
index dd39524b60..052a860da4 100644
--- a/input/cql/IMMZD2DTYellowFever.cql
+++ b/input/cql/IMMZD2DTYellowFever.cql
@@ -17,12 +17,6 @@ include IMMZD2DTYellowFeverInput called input
 // End Skeleton CQL
 context Patient
 
-/*
-@dynamicValue: Due date of the dose
-*/
-define "Due date of the dose":
-	Now()
-
 /*
 @dynamicValue: Guidance
 */
diff --git a/input/cql/IMMZD2DTYellowFeverInput.cql b/input/cql/IMMZD2DTYellowFeverInput.cql
index 3d886dd1fa..87414d02a3 100644
--- a/input/cql/IMMZD2DTYellowFeverInput.cql
+++ b/input/cql/IMMZD2DTYellowFeverInput.cql
@@ -27,14 +27,14 @@ define "Yellow Fever Doses Administered to Patient":
 @pseudocode: Count of vaccines administered (where "Vaccine type" = "Yellow fever containing vaccines" and "Type of dose" = "Primary series" ) = 0
 */
 define "No yellow fever primary series doses were administered":
-	not exists("Yellow Fever Doses Administered to Patient" I where I.occurrence after Patient.birthDate + 9 months)
+	not exists("Yellow Fever Doses Administered to Patient" I where difference in days between I.occurrence and Patient.birthDate + 9 months <= 0)
 
 /*
 @input: One yellow fever primary series dose was administered
 @pseudocode: Count of vaccines administered (where "Vaccine type" = "Yellow fever containing vaccines" and "Type of dose" = "Primary series" ) = 1
 */
 define "One yellow fever primary series dose was administered":
-	Count("Yellow Fever Doses Administered to Patient" I where I.occurrence after Patient.birthDate + 9 months) >= 1
+	Count("Yellow Fever Doses Administered to Patient" I where difference in days between I.occurrence and Patient.birthDate + 9 months <= 0) >= 1
 
 /*
 @input: Client's age is less than 6 months
diff --git a/input/fsh/plandefinitions/IMMZPDrulesets.fsh b/input/fsh/plandefinitions/IMMZPDrulesets.fsh
index f99d92db1f..7117970976 100644
--- a/input/fsh/plandefinitions/IMMZPDrulesets.fsh
+++ b/input/fsh/plandefinitions/IMMZPDrulesets.fsh
@@ -31,12 +31,6 @@ RuleSet: PlanDefMedicationRequestAction( title, description, condition, library
     * expression
       * language = #text/cql
       * expression = "'proposal'"
-  * dynamicValue[+]
-    * path = "dispenseRequest.validityPeriod.start"
-    * expression
-      * description = "Due date of the dose"
-      * language = #text/cql-identifier
-      * expression = "Due date of the dose"
 
 RuleSet: PlanDefMedicationRequestUpdate( title, description, condition, library, mrid )
 * action[+]