diff --git a/src/wpc/sims/wpc/full/afm.c b/src/wpc/sims/wpc/full/afm.c
index 8ce36d16e..512b9e4da 100644
--- a/src/wpc/sims/wpc/full/afm.c
+++ b/src/wpc/sims/wpc/full/afm.c
@@ -425,7 +425,7 @@ static core_tGameData afmGameData = {
   GEN_WPC95, wpc_dispDMD,
   {
     FLIP_SW(FLIP_L | FLIP_U) | FLIP_SOL(FLIP_L),
-    0,2,3,0,0,1,0, // 2 extra lamp columns for the LEDs
+    0,2,3,0,0,0,0, // 2 extra lamp columns for the LEDs
     afm_getSol, afm_handleMech, afm_getMech, afm_drawMech,
     NULL
 #ifdef ENABLE_MECHANICAL_SAMPLES
diff --git a/src/wpc/sims/wpc/full/fh.c b/src/wpc/sims/wpc/full/fh.c
index 3151d12e7..cfee0450a 100644
--- a/src/wpc/sims/wpc/full/fh.c
+++ b/src/wpc/sims/wpc/full/fh.c
@@ -717,7 +717,7 @@ static core_tGameData fhGameData = {
   GEN_WPCALPHA_2, wpc_dispAlpha, /* generation */
   {
     FLIP_SWNO(12,11),   /* Which switches are the flippers */
-    0,0,0,0,0,1,0,
+    0,0,0,0,0,0,0,
     NULL, fh_handleMech, NULL, fh_drawMech,
     &fh_lampPos
 #ifdef ENABLE_MECHANICAL_SAMPLES
diff --git a/src/wpc/sims/wpc/full/mm.c b/src/wpc/sims/wpc/full/mm.c
index ce6e36e76..08263f771 100644
--- a/src/wpc/sims/wpc/full/mm.c
+++ b/src/wpc/sims/wpc/full/mm.c
@@ -508,7 +508,7 @@ static core_tGameData mmGameData = {
   GEN_WPC95, wpc_dispDMD,
   {
     FLIP_SW(FLIP_L | FLIP_U) | FLIP_SOL(FLIP_L),
-    0,0,0,0,0,1,0,
+    0,0,0,0,0,0,0,
     NULL, mm_handleMech, mm_getMech, mm_drawMech,
     &mm_lampPos
 #ifdef ENABLE_MECHANICAL_SAMPLES
diff --git a/src/wpc/sims/wpc/full/nbaf.c b/src/wpc/sims/wpc/full/nbaf.c
index e2ba02405..527c542fd 100644
--- a/src/wpc/sims/wpc/full/nbaf.c
+++ b/src/wpc/sims/wpc/full/nbaf.c
@@ -554,7 +554,7 @@ static core_tGameData nbafGameData = {
     FLIP_SW(FLIP_L | FLIP_U) | FLIP_SOL(FLIP_L),     // other switches/solenoids used for non-flippers
     0,0,0,  /* custom switch columns, lamp columns, solenoids */
     0,0,    /* sound board, display */
-    1,0,    /* gameSpecific1 (unknown why we set this -- unused on WPC?), gameSpecific2 */
+    0,0,    /* gameSpecific1, gameSpecific2 */
     nbaf_getSol, nbaf_handleMech, nbaf_getMech, nbaf_drawMech,
     &nbaf_lampPos,          /* lampData */
   },
diff --git a/src/wpc/sims/wpc/full/ngg.c b/src/wpc/sims/wpc/full/ngg.c
index 80ae42876..ddfdca593 100644
--- a/src/wpc/sims/wpc/full/ngg.c
+++ b/src/wpc/sims/wpc/full/ngg.c
@@ -626,7 +626,7 @@ static core_tGameData nggGameData = {
   GEN_WPC95, wpc_dispDMD,
   {
     FLIP_SW(FLIP_L | FLIP_U) | FLIP_SOL(FLIP_L | FLIP_UR),
-    0,0,8,0,0,1,0,
+    0,0,8,0,0,0,0,
     ngg_getSol, ngg_handleMech, ngg_getMech, ngg_drawMech,
     &ngg_lampPos
 #ifdef ENABLE_MECHANICAL_SAMPLES
diff --git a/src/wpc/sims/wpc/full/ss.c b/src/wpc/sims/wpc/full/ss.c
index ab8102513..5776fdf4e 100644
--- a/src/wpc/sims/wpc/full/ss.c
+++ b/src/wpc/sims/wpc/full/ss.c
@@ -465,8 +465,7 @@ static core_tGameData ssGameData = {
   {
     FLIP_SW(FLIP_L | FLIP_U) | FLIP_SOL(FLIP_L),
     // 2 extra lamp columns for the LEDs of rev. 0.1
-    // Why do we set gameSpecific1 as this is unused on WPC ?
-    /*swCol*/0,/*lampCol*/2,/*custSol*/0,/*soundBoard*/0,/*display*/0,/*gameSpecific1*/1,/*gameSpecific2*/0,
+    /*swCol*/0,/*lampCol*/2,/*custSol*/0,/*soundBoard*/0,/*display*/0,/*gameSpecific1*/0,/*gameSpecific2*/0,
     NULL, ss_handleMech, ss_getMech, ss_drawMech,
     NULL
 #ifdef ENABLE_MECHANICAL_SAMPLES
diff --git a/src/wpc/sims/wpc/full/ww.c b/src/wpc/sims/wpc/full/ww.c
index 613ea8a75..32f41f079 100644
--- a/src/wpc/sims/wpc/full/ww.c
+++ b/src/wpc/sims/wpc/full/ww.c
@@ -508,7 +508,7 @@ static core_tGameData lh5GameData = {
   GEN_WPCFLIPTRON, wpc_dispDMD,
   {
     FLIP_SW(FLIP_L | FLIP_UR) | FLIP_SOL(FLIP_L | FLIP_UR),
-    0,2,0,0,0,1,0,
+    0,2,0,0,0,0,0,
     NULL, ww_handleMech, ww_getMech, ww_drawMech,
     NULL
 #ifdef ENABLE_MECHANICAL_SAMPLES
diff --git a/src/wpc/sims/wpc/prelim/cc.c b/src/wpc/sims/wpc/prelim/cc.c
index c60176a19..e004e441a 100644
--- a/src/wpc/sims/wpc/prelim/cc.c
+++ b/src/wpc/sims/wpc/prelim/cc.c
@@ -351,7 +351,7 @@ static core_tGameData ccGameData = {
   GEN_WPC95, wpc_dispDMD,
   {
     FLIP_SW(FLIP_L | FLIP_U) | FLIP_SOL(FLIP_L),
-    0,0,0,0,0,1,0,
+    0,0,0,0,0,0,0,
     NULL,NULL,NULL,NULL,&cc_lampPos
 #ifdef ENABLE_MECHANICAL_SAMPLES
     ,NULL
diff --git a/src/wpc/sims/wpc/prelim/congo.c b/src/wpc/sims/wpc/prelim/congo.c
index 7b1d85060..db16e512b 100644
--- a/src/wpc/sims/wpc/prelim/congo.c
+++ b/src/wpc/sims/wpc/prelim/congo.c
@@ -321,7 +321,7 @@ static core_tGameData congoGameData = {
   GEN_WPC95, wpc_dispDMD,
   {
     FLIP_SW(FLIP_L | FLIP_U) | FLIP_SOL(FLIP_L | FLIP_UL),
-    0,0,0,0,0,1
+    0,0,0,0,0,0,0
   },
   &congoSimData,
   {
diff --git a/src/wpc/sims/wpc/prelim/corv.c b/src/wpc/sims/wpc/prelim/corv.c
index 22d59a621..5aeaef306 100644
--- a/src/wpc/sims/wpc/prelim/corv.c
+++ b/src/wpc/sims/wpc/prelim/corv.c
@@ -435,7 +435,7 @@ static core_tGameData corvGameData = {
   GEN_WPCSECURITY, wpc_dispDMD,
   {
     FLIP_SW(FLIP_L | FLIP_U) | FLIP_SOL(FLIP_L | FLIP_UL),
-    0,0,3,0,0,1,0, // 3 extra solenoids
+    0,0,3,0,0,0,0, // 3 extra solenoids
     corv_getSol, corv_handleMech, corv_getMech, corv_drawMech,
     NULL
 #ifdef ENABLE_MECHANICAL_SAMPLES
diff --git a/src/wpc/sims/wpc/prelim/cp.c b/src/wpc/sims/wpc/prelim/cp.c
index c3d7cc789..84847e8db 100644
--- a/src/wpc/sims/wpc/prelim/cp.c
+++ b/src/wpc/sims/wpc/prelim/cp.c
@@ -294,7 +294,7 @@ static core_tGameData cpGameData = {
   GEN_WPC95, wpc_dispDMD,
   {
     FLIP_SW(FLIP_L | FLIP_U) | FLIP_SOL(FLIP_L),
-    0,4,0,0,0,1,0, // 4 extra lamp columns for the LEDs
+    0,4,0,0,0,0,0, // 4 extra lamp columns for the LEDs
   },
   &cpSimData,
   {
diff --git a/src/wpc/sims/wpc/prelim/cv.c b/src/wpc/sims/wpc/prelim/cv.c
index 13497ef6b..3ca9d207d 100644
--- a/src/wpc/sims/wpc/prelim/cv.c
+++ b/src/wpc/sims/wpc/prelim/cv.c
@@ -363,7 +363,7 @@ static core_tGameData cvGameData = {
   GEN_WPC95, wpc_dispDMD,
   {
     FLIP_SW(FLIP_L | FLIP_U) | FLIP_SOL(FLIP_L),
-    0,0,2,0,0,1,0,
+    0,0,2,0,0,0,0,
     cv_getSol, cv_handleMech, cv_getMech, cv_drawMech,
     NULL
 #ifdef ENABLE_MECHANICAL_SAMPLES
diff --git a/src/wpc/sims/wpc/prelim/jy.c b/src/wpc/sims/wpc/prelim/jy.c
index 2fb09c99d..5a24a9bfa 100644
--- a/src/wpc/sims/wpc/prelim/jy.c
+++ b/src/wpc/sims/wpc/prelim/jy.c
@@ -304,7 +304,7 @@ static core_tGameData jyGameData = {
   GEN_WPC95, wpc_dispDMD,
   {
     FLIP_SW(FLIP_L | FLIP_U) | FLIP_SOL(FLIP_L),
-    0,0,0,0,0,1
+    0,0,0,0,0,0,0
   },
   &jySimData,
   {
diff --git a/src/wpc/sims/wpc/prelim/mb.c b/src/wpc/sims/wpc/prelim/mb.c
index cc0569a99..b4fb6ea21 100644
--- a/src/wpc/sims/wpc/prelim/mb.c
+++ b/src/wpc/sims/wpc/prelim/mb.c
@@ -322,7 +322,7 @@ static core_tGameData mbGameData = {
   GEN_WPC95, wpc_dispDMD,
   {
     FLIP_SW(FLIP_L | FLIP_U) | FLIP_SOL(FLIP_L),
-    0,0,0,0,0,1,0,
+    0,0,0,0,0,0,0,
     NULL, mb_handleMech, mb_getMech, mb_drawMech,
     NULL
 #ifdef ENABLE_MECHANICAL_SAMPLES
diff --git a/src/wpc/sims/wpc/prelim/sc.c b/src/wpc/sims/wpc/prelim/sc.c
index 035384255..8d55ad6ca 100644
--- a/src/wpc/sims/wpc/prelim/sc.c
+++ b/src/wpc/sims/wpc/prelim/sc.c
@@ -319,7 +319,7 @@ static core_tGameData scGameData = {
   GEN_WPC95, wpc_dispDMD,
   {
     FLIP_SW(FLIP_L | FLIP_UR) | FLIP_SOL(FLIP_L | FLIP_UR),
-    0,6,0,0,0,1
+    0,6,0,0,0,0,0
   },
   &scSimData,
   {
diff --git a/src/wpc/sims/wpc/prelim/totan.c b/src/wpc/sims/wpc/prelim/totan.c
index c225399fb..d12e4a910 100644
--- a/src/wpc/sims/wpc/prelim/totan.c
+++ b/src/wpc/sims/wpc/prelim/totan.c
@@ -330,7 +330,7 @@ static core_tGameData totanGameData = {
   GEN_WPC95, wpc_dispDMD,
   {
     FLIP_SW(FLIP_L | FLIP_U) | FLIP_SOL(FLIP_L),
-    0,0,0,0,0,1
+    0,0,0,0,0,0,0
   },
   &totanSimData,
   {