diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 177f7f960..7ca539b78 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -16,7 +16,13 @@
       <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
       <div class="row my-2">
         <div class="col">
-          <textboxQuestion cmsWidgetName="LicensePlateNumber" v-model="licensePlate" isRequired inputId="license_plate" validationRules="license-plate-required"  />
+          <textboxQuestion
+            cmsWidgetName="LicensePlateNumber"
+            v-model="licensePlate"
+            isRequired
+            inputId="license_plate"
+            validationRules="license-plate-required"
+          />
         </div>
       </div>
       <div class="row my-2">
@@ -28,7 +34,14 @@
             mask="#####"
             validationRules="zip-required"
           />
-          <textboxQuestion cmsWidgetName="RegistrationZip" v-model="registrationZip" isRequired inputId="zip" mask="#####" validationRules="zip-required" />
+          <textboxQuestion
+            cmsWidgetName="RegistrationZip"
+            v-model="registrationZip"
+            isRequired
+            inputId="zip"
+            mask="#####"
+            validationRules="zip-required"
+          />
         </div>
       </div>
       <div class="row my-2">
@@ -39,7 +52,13 @@
             inputId="email"
             validationRules="email-address-required|email-address-format"
           />
-          <textboxQuestion cmsWidgetName="EmailAddress" v-model="email" isRequired inputId="email" validationRules="email-address-required|email-address-format" />
+          <textboxQuestion
+            cmsWidgetName="EmailAddress"
+            v-model="email"
+            isRequired
+            inputId="email"
+            validationRules="email-address-required|email-address-format"
+          />
         </div>
       </div>
       <alert
@@ -344,31 +363,13 @@ export default {
       store.commit(storeMutations.UPDATE_MODEL, vehicleInfo.model);
       store.commit(storeMutations.UPDATE_STYLE, vehicleInfo.style);
       store.commit(storeMutations.UPDATE_CAR_ID, vehicleInfo.carId);
-      store.commit(
-        storeMutations.UPDATE_VEHICLE_CATEGORY,
-        vehicleInfo.category
-      );
-      store.commit(
-        storeMutations.UPDATE_VEHICLE_IMAGE_URL,
-        vehicleInfo.imageUrl
-      );
-      store.commit(
-        storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER,
-        vehicleInfo.imageVifNumber
-      );
-      store.commit(
-        storeMutations.UPDATE_VEHICLE_IMAGE_COLOR,
-        vehicleInfo.imageColor
-      );
-      store.commit(
-        storeMutations.UPDATE_REGISTRATION_LICENSE_PLATE,
-        this.licensePlate
-      );
+      store.commit(storeMutations.UPDATE_VEHICLE_CATEGORY,vehicleInfo.category);
+      store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL,vehicleInfo.imageUrl);
+      store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER,vehicleInfo.imageVifNumber);
+      store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR,vehicleInfo.imageColor);
+      store.commit(storeMutations.UPDATE_REGISTRATION_LICENSE_PLATE,this.licensePlate);
       store.commit(storeMutations.UPDATE_REGISTRATION_STATE, registrationState);
-      store.commit(
-        storeMutations.UPDATE_REGISTRATION_ZIP_CODE,
-        this.registrationZip
-      );
+      store.commit(storeMutations.UPDATE_REGISTRATION_ZIP_CODE,this.registrationZip);
       store.commit(storeMutations.UPDATE_SERVICE_LOCATION_ZIP, this.serviceZip);
       store.commit(storeMutations.UPDATE_CUSTOMER_EMAIL_ADDRESS, this.email);
     },
@@ -400,4 +401,4 @@ export default {
     funnelFooter,
   },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/router/index.js b/src/router/index.js
index 5b24b0205..1af18ec1b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -79,9 +79,6 @@ const routes = [
             await GoToFunnelStartOn404(next);
           }
 
-          // Run analytics logic, if there is any for the page.
-          //attachCustomEvents(component);
-
           return next({ name: to.query.fmgPage, query: to.query, params: to.params });
         }
 
@@ -103,9 +100,6 @@ const routes = [
           await GoToFunnelStartOn404(next);
         }
 
-        // Run analytics logic, if there is any for the page.
-        //attachCustomEvents(nextComponent);
-
         // Assign current query string parameters, as well as our fmgPage one.
         next({
           name: routeData[0].name,
@@ -281,14 +275,4 @@ function resetDependentState(component) {
   return component.default.methods.resetDependentState();
 }
 
-// Run analytics logic to run custom events.
-function attachCustomEvents(component) {
-  try {
-    return component.default.methods.attachCustomEvents();
-  } catch (error) {
-    console.log(error);
-    return; // Eat the exception, analytics events shouldn't break anything.
-  }
-}
-
 export default router;
\ No newline at end of file