diff --git a/src/arch/Lights/LightsDriver_HidBlueDot.cpp b/src/arch/Lights/LightsDriver_HidBlueDot.cpp
index 3bb09ecbbd..fa3590f44a 100644
--- a/src/arch/Lights/LightsDriver_HidBlueDot.cpp
+++ b/src/arch/Lights/LightsDriver_HidBlueDot.cpp
@@ -4,11 +4,11 @@
 
 REGISTER_LIGHTS_DRIVER_CLASS(HidBlueDot);
 
-LightsDriver_HidBlueDot::LightsDriver_HidBlueDot() : dev{VID, PID}
+LightsDriver_HidBlueDot::LightsDriver_HidBlueDot() :
+	dev{VID, PID},
+	m_iCabData{ 0 },
+	m_iPadData{ 0 }
 {
-	memset(m_iCabData, 0x00, sizeof(m_iCabData));
-	memset(m_iPadData, 0x00, sizeof(m_iPadData));
-
 	m_iCabData[1] = 0x01;
 	m_iPadData[1] = 0x02;
 }
diff --git a/src/arch/Lights/LightsDriver_snek.cpp b/src/arch/Lights/LightsDriver_snek.cpp
index 6c04eaf960..d2f81d5641 100644
--- a/src/arch/Lights/LightsDriver_snek.cpp
+++ b/src/arch/Lights/LightsDriver_snek.cpp
@@ -6,9 +6,11 @@
 
 REGISTER_LIGHTS_DRIVER_CLASS(snek);
 
-LightsDriver_snek::LightsDriver_snek() : dev{ SNEK_VID , SNEK_PID , SNEK_LIGHTING_INTERFACENUM }
+LightsDriver_snek::LightsDriver_snek() :
+	dev{ SNEK_VID , SNEK_PID , SNEK_LIGHTING_INTERFACENUM },
+	stateChanged{ false },
+	outputBuffer{0}
 {
-	memset(outputBuffer, 0x00, SNEK_HIDREPORT_SIZE);
 }
 
 LightsDriver_snek::~LightsDriver_snek()
diff --git a/src/arch/Lights/LightsDriver_snek.h b/src/arch/Lights/LightsDriver_snek.h
index 79229229ec..5b19174051 100644
--- a/src/arch/Lights/LightsDriver_snek.h
+++ b/src/arch/Lights/LightsDriver_snek.h
@@ -101,7 +101,7 @@ private:
 	HidDevice dev;
 
 	bool stateChanged = false;
-	uint8_t outputBuffer[SNEK_HIDREPORT_SIZE] = {0};
+	uint8_t outputBuffer[SNEK_HIDREPORT_SIZE];
 
 	void SetBuffer(int index, bool lightState);
 
diff --git a/src/arch/Lights/LightsDriver_stac.cpp b/src/arch/Lights/LightsDriver_stac.cpp
index f09f77d662..37d6f4b503 100644
--- a/src/arch/Lights/LightsDriver_stac.cpp
+++ b/src/arch/Lights/LightsDriver_stac.cpp
@@ -6,10 +6,11 @@
 
 REGISTER_LIGHTS_DRIVER_CLASS(stac);
 
-LightsDriver_stac::LightsDriver_stac() : devs{{STAC_VID , STAC_PID_P1, STAC_LIGHTING_INTERFACE}, {STAC_VID , STAC_PID_P2, STAC_LIGHTING_INTERFACE }}
+LightsDriver_stac::LightsDriver_stac() :
+	devs{ {STAC_VID , STAC_PID_P1, STAC_LIGHTING_INTERFACE}, {STAC_VID , STAC_PID_P2, STAC_LIGHTING_INTERFACE } },
+	stateChanged{ false },
+	outputBuffer{ {0} }
 {
-	memset(outputBuffer[GameController_1], 0x00, STAC_HIDREPORT_SIZE);
-	memset(outputBuffer[GameController_2], 0x00, STAC_HIDREPORT_SIZE);
 }
 
 LightsDriver_stac::~LightsDriver_stac()
diff --git a/src/arch/Lights/LightsDriver_stac.h b/src/arch/Lights/LightsDriver_stac.h
index de38a4a082..ee2f84be57 100644
--- a/src/arch/Lights/LightsDriver_stac.h
+++ b/src/arch/Lights/LightsDriver_stac.h
@@ -52,8 +52,8 @@ class LightsDriver_stac : public LightsDriver
 private:
 	HidDevice devs[STAC_MAX_NUMBER];
 
-	bool stateChanged[STAC_MAX_NUMBER] = {false};
-	uint8_t outputBuffer[STAC_MAX_NUMBER][STAC_HIDREPORT_SIZE] = {0};
+	bool stateChanged[STAC_MAX_NUMBER];
+	uint8_t outputBuffer[STAC_MAX_NUMBER][STAC_HIDREPORT_SIZE];
 
 	void HandleState(const LightsState *ls, GameController ctrlNum);
 	void SetBuffer(int index, bool lightState, GameController ctrlNum);