diff --git a/src/spicelib/devices/bsim4/b4noi.c b/src/spicelib/devices/bsim4/b4noi.c
index d56b19cb2..c6aa87936 100644
--- a/src/spicelib/devices/bsim4/b4noi.c
+++ b/src/spicelib/devices/bsim4/b4noi.c
@@ -366,9 +366,6 @@ double mult_i, mult_fn;
                                   epsilon = (T7 - T7 * T7 * T7 / 3.0) / (6.0 * T6);
                               T8 = here->BSIM4Vgsteff / here->BSIM4EsatL;
                               T8 *= T8;
-                              // if ((strcmp(model->BSIM4version, "4.8.1")) && (strncmp(model->BSIM4version, "4.81", 4)) && (strncmp(model->BSIM4version, "4.8", 3)) &&
-                              //     (strcmp(model->BSIM4version, "4.8.2")) && (strncmp(model->BSIM4version, "4.82", 4)) &&
-                              //     (strcmp(model->BSIM4version, "4.8.3")) && (strncmp(model->BSIM4version, "4.83", 4)))
                               if (model->BSIM4v48intVersion<=BSIM4v48V480) 
                               {
                               npart_c = model->BSIM4rnoic * (1.0 + T8
@@ -421,9 +418,6 @@ double mult_i, mult_fn;
                           }
                               switch(model->BSIM4tnoiMod)
                   {  case 0:
-                    // if ((strcmp(model->BSIM4version, "4.8.1")) && (strncmp(model->BSIM4version, "4.81", 4)) && (strncmp(model->BSIM4version, "4.8", 3)) &&
-                    //     (strcmp(model->BSIM4version, "4.8.2")) && (strncmp(model->BSIM4version, "4.82", 4)) &&
-                    //     (strcmp(model->BSIM4version, "4.8.3")) && (strncmp(model->BSIM4version, "4.83", 4)))
                     if (model->BSIM4v48intVersion<=BSIM4v48V480) 
                     {
                       T0 = here->BSIM4ueff * fabs(here->BSIM4qinv);
@@ -451,9 +445,6 @@ double mult_i, mult_fn;
                     }
                       break;
                  case 1:
-                 // if ((strcmp(model->BSIM4version, "4.8.1")) && (strncmp(model->BSIM4version, "4.81", 4)) && (strncmp(model->BSIM4version, "4.8", 3)) &&
-                 //     (strcmp(model->BSIM4version, "4.8.2")) && (strncmp(model->BSIM4version, "4.82", 4)) &&
-                 //     (strcmp(model->BSIM4version, "4.8.3")) && (strncmp(model->BSIM4version, "4.83", 4)))
                  if (model->BSIM4v48intVersion<=BSIM4v48V480) 
                  {
                       T0 = here->BSIM4gm + here->BSIM4gmbs + here->BSIM4gds;
diff --git a/src/spicelib/devices/bsim4/b4set.c b/src/spicelib/devices/bsim4/b4set.c
index 72495a636..71bc75a81 100644
--- a/src/spicelib/devices/bsim4/b4set.c
+++ b/src/spicelib/devices/bsim4/b4set.c
@@ -355,9 +355,6 @@ BSIM4instance **InstArray;
         if (!model->BSIM4ucsGiven)
             model->BSIM4ucs = (model->BSIM4type == NMOS) ? 1.67 : 1.0;
 
-        // if ((strcmp(model->BSIM4version, "4.8.1")) && (strncmp(model->BSIM4version, "4.81", 4)) &&
-        //     (strcmp(model->BSIM4version, "4.8.2")) && (strncmp(model->BSIM4version, "4.82", 4)) &&
-        //     (strcmp(model->BSIM4version, "4.8.3")) && (strncmp(model->BSIM4version, "4.83", 4)))
         if (model->BSIM4v48intVersion<=BSIM4v48V480)
         {
                 if (!model->BSIM4uaGiven)
@@ -2375,11 +2372,6 @@ BSIM4instance **InstArray;
             if (!here->BSIM4ngconGiven)
                 here->BSIM4ngcon = model->BSIM4ngcon;
 
-            // Recursive scaling produces incorrect results after second call to setup()
-            // here->BSIM4mult_i = here->BSIM4mult_i * here->BSIM4m;
-            // here->BSIM4mult_q = here->BSIM4mult_q * here->BSIM4m;
-            // here->BSIM4mult_fn = here->BSIM4mult_fn * here->BSIM4m;
-
             /* Process instance model selectors, some
              * may override their global counterparts
             */
diff --git a/src/spicelib/devices/bsim4/b4temp.c b/src/spicelib/devices/bsim4/b4temp.c
index f4c76dd65..9e786ab3c 100644
--- a/src/spicelib/devices/bsim4/b4temp.c
+++ b/src/spicelib/devices/bsim4/b4temp.c
@@ -1372,10 +1372,6 @@ int Fatal_Flag = 0;
                   pParam->BSIM4Aechvb = (model->BSIM4type == NMOS) ? 4.97232e-7 : 3.42537e-7;
                   pParam->BSIM4Bechvb = (model->BSIM4type == NMOS) ? 7.45669e11 : 1.16645e12;
 
-                  // if ((strcmp(model->BSIM4version, "4.8.1")) && (strncmp(model->BSIM4version, "4.81", 4)) &&
-                  //     (strcmp(model->BSIM4version, "4.8.2")) && (strncmp(model->BSIM4version, "4.82", 4)) &&
-                  //     (strcmp(model->BSIM4version, "4.8.3")) && (strncmp(model->BSIM4version, "4.83", 4)))
-                  // {
                   if (model->BSIM4v48intVersion<=BSIM4v48V480) {
                   pParam->BSIM4AechvbEdgeS = pParam->BSIM4Aechvb * pParam->BSIM4weff
                       * model->BSIM4dlcig * pParam->BSIM4ToxRatioEdge;