diff --git a/src/spicelib/devices/bsim4/b4set.c b/src/spicelib/devices/bsim4/b4set.c
index c27cbca31..19cbf34ac 100644
--- a/src/spicelib/devices/bsim4/b4set.c
+++ b/src/spicelib/devices/bsim4/b4set.c
@@ -2697,7 +2697,6 @@ BSIM4unsetup(
 GENmodel *inModel,
 CKTcircuit *ckt)
 {
-#ifndef HAS_BATCHSIM
     BSIM4model *model;
     BSIM4instance *here;
 
@@ -2756,6 +2755,6 @@ CKTcircuit *ckt)
             }
         }
     }
-#endif
+
     return OK;
 }
diff --git a/src/spicelib/devices/bsim4v5/b4v5set.c b/src/spicelib/devices/bsim4v5/b4v5set.c
index 00e06cfe3..c6690ade9 100644
--- a/src/spicelib/devices/bsim4v5/b4v5set.c
+++ b/src/spicelib/devices/bsim4v5/b4v5set.c
@@ -2123,7 +2123,6 @@ BSIM4v5unsetup(
     GENmodel *inModel,
     CKTcircuit *ckt)
 {
-#ifndef HAS_BATCHSIM
     BSIM4v5model *model;
     BSIM4v5instance *here;
 
@@ -2182,6 +2181,6 @@ BSIM4v5unsetup(
             }
         }
     }
-#endif
+
     return OK;
 }
diff --git a/src/spicelib/devices/bsim4v6/b4v6set.c b/src/spicelib/devices/bsim4v6/b4v6set.c
index 311f7b431..7de8eecd0 100644
--- a/src/spicelib/devices/bsim4v6/b4v6set.c
+++ b/src/spicelib/devices/bsim4v6/b4v6set.c
@@ -2456,7 +2456,6 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
 int
 BSIM4v6unsetup(GENmodel *inModel, CKTcircuit *ckt)
 {
-#ifndef HAS_BATCHSIM
     BSIM4v6model *model;
     BSIM4v6instance *here;
 
@@ -2521,6 +2520,6 @@ BSIM4v6unsetup(GENmodel *inModel, CKTcircuit *ckt)
             }
         }
     }
-#endif
+
     return OK;
 }
diff --git a/src/spicelib/devices/bsim4v7/b4v7set.c b/src/spicelib/devices/bsim4v7/b4v7set.c
index 01382963b..d420376a9 100644
--- a/src/spicelib/devices/bsim4v7/b4v7set.c
+++ b/src/spicelib/devices/bsim4v7/b4v7set.c
@@ -2613,7 +2613,6 @@ BSIM4v7unsetup(
 GENmodel *inModel,
 CKTcircuit *ckt)
 {
-#ifndef HAS_BATCHSIM
     BSIM4v7model *model;
     BSIM4v7instance *here;
 
@@ -2672,6 +2671,6 @@ CKTcircuit *ckt)
             }
         }
     }
-#endif
+
     return OK;
 }
diff --git a/src/spicelib/devices/bsimsoi/b4soiset.c b/src/spicelib/devices/bsimsoi/b4soiset.c
index 24ab75c27..1a6188eb0 100644
--- a/src/spicelib/devices/bsimsoi/b4soiset.c
+++ b/src/spicelib/devices/bsimsoi/b4soiset.c
@@ -2746,7 +2746,6 @@ B4SOIunsetup(
     GENmodel *inModel,
     CKTcircuit *ckt)
 {
-#ifndef HAS_BATCHSIM
     B4SOImodel *model;
     B4SOIinstance *here;
 
@@ -2771,6 +2770,6 @@ B4SOIunsetup(
             // FIXME, lots missing !
         }
     }
-#endif
+
     return OK;
 }
diff --git a/src/spicelib/devices/hisim2/hsm2set.c b/src/spicelib/devices/hisim2/hsm2set.c
index 5f5a2abbd..c75dfca4b 100644
--- a/src/spicelib/devices/hisim2/hsm2set.c
+++ b/src/spicelib/devices/hisim2/hsm2set.c
@@ -1297,7 +1297,6 @@ HSM2unsetup(
     GENmodel *inModel,
     CKTcircuit *ckt)
 {
-#ifndef HAS_BATCHSIM
     HSM2model *model;
     HSM2instance *here;
  
@@ -1345,6 +1344,6 @@ HSM2unsetup(
             }
         }
     }
-#endif
+
     return OK;
 }
diff --git a/src/spicelib/devices/hisimhv1/hsmhvset.c b/src/spicelib/devices/hisimhv1/hsmhvset.c
index ca6e14b8e..a33f155a3 100644
--- a/src/spicelib/devices/hisimhv1/hsmhvset.c
+++ b/src/spicelib/devices/hisimhv1/hsmhvset.c
@@ -1458,7 +1458,6 @@ HSMHVunsetup(
     GENmodel *inModel,
     CKTcircuit *ckt)
 {
-#ifndef HAS_BATCHSIM
     HSMHVmodel *model;
     HSMHVinstance *here;
  
@@ -1507,6 +1506,6 @@ HSMHVunsetup(
             // FIXME, HSMHVtempNode HSMHVqiNode HSMHVqbNode
         }
     }
-#endif
+
     return OK;
 }
diff --git a/src/spicelib/devices/hisimhv2/hsmhv2set.c b/src/spicelib/devices/hisimhv2/hsmhv2set.c
index 34162cbbf..161d164b1 100644
--- a/src/spicelib/devices/hisimhv2/hsmhv2set.c
+++ b/src/spicelib/devices/hisimhv2/hsmhv2set.c
@@ -1726,7 +1726,6 @@ HSMHV2unsetup(
     GENmodel *inModel,
     CKTcircuit *ckt)
 {
-#ifndef HAS_BATCHSIM
     HSMHV2model *model;
     HSMHV2instance *here;
  
@@ -1775,6 +1774,6 @@ HSMHV2unsetup(
             // FIXME, HSMHV2tempNode HSMHV2qiNode HSMHV2qbNode
         }
     }
-#endif
+
     return OK;
 }