diff --git a/firmware/controllers/trigger/decoders/trigger_mazda.cpp b/firmware/controllers/trigger/decoders/trigger_mazda.cpp
index 08edc88bc3..48e84799b4 100644
--- a/firmware/controllers/trigger/decoders/trigger_mazda.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_mazda.cpp
@@ -20,8 +20,7 @@
 
 #include "trigger_mazda.h"
 
-// todo: remove useOnlyRisingEdgeForTrigger parameter from here see https://github.com/rusefi/rusefi/issues/635
-void initializeMazdaMiataNaShape(TriggerShape *s, bool useOnlyRisingEdgeForTrigger) {
+void initializeMazdaMiataNaShape(TriggerShape *s) {
 	s->initialize(FOUR_STROKE_CAM_SENSOR, true);
 	s->setTriggerSynchronizationGap2(1.4930 * 0.6f, 1.4930 * 1.3f);
 	s->useRiseEdge = false;
diff --git a/firmware/controllers/trigger/decoders/trigger_mazda.h b/firmware/controllers/trigger/decoders/trigger_mazda.h
index 58c0ffa84f..4f630cac35 100644
--- a/firmware/controllers/trigger/decoders/trigger_mazda.h
+++ b/firmware/controllers/trigger/decoders/trigger_mazda.h
@@ -12,7 +12,7 @@
 
 #define MIATA_NA_GAP 1.4930f
 
-void initializeMazdaMiataNaShape(TriggerShape *s, bool useOnlyRisingEdgeForTrigger);
+void initializeMazdaMiataNaShape(TriggerShape *s);
 void initializeMazdaMiataNb1Shape(TriggerShape *s);
 void initializeMazdaMiataNb2Crank(TriggerShape *s);
 void initializeMazdaMiataVVtTestShape(TriggerShape *s);
diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp
index c01aba8514..f3b4c35943 100644
--- a/firmware/controllers/trigger/decoders/trigger_structure.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp
@@ -420,7 +420,7 @@ void TriggerShape::initializeTriggerShape(Logging *logger, operation_mode_e oper
 		break;
 
 	case TT_MAZDA_MIATA_NA:
-		initializeMazdaMiataNaShape(this, useOnlyRisingEdgeForTrigger);
+		initializeMazdaMiataNaShape(this);
 		break;
 
 	case TT_MAZDA_MIATA_NB1:
@@ -592,6 +592,10 @@ void TriggerShape::initializeTriggerShape(Logging *logger, operation_mode_e oper
 		shapeDefinitionError = true;
 		warning(CUSTOM_ERR_NO_SHAPE, "initializeTriggerShape() not implemented: %d", triggerConfig->type);
 	}
+	/**
+	 * Feb 2019 suggestion: it would be an improvement to remove 'expectedEventCount' logic from 'addEvent'
+	 * and move it here, after all events were added.
+	 */
 	calculateExpectedEventCounts(useOnlyRisingEdgeForTrigger);
 	version++;