diff --git a/src/spicelib/devices/csw/cswacld.c b/src/spicelib/devices/csw/cswacld.c
index 684e31ee0..6bf052d15 100644
--- a/src/spicelib/devices/csw/cswacld.c
+++ b/src/spicelib/devices/csw/cswacld.c
@@ -2,8 +2,6 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Gordon Jacobs
 **********/
-/*
- */
 
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
@@ -14,19 +12,13 @@ Author: 1985 Gordon Jacobs
 
 int
 CSWacLoad(GENmodel *inModel, CKTcircuit *ckt)
-/* load the current values into the
- * sparse matrix previously provided
- * during AC analysis
- */
 {
     CSWmodel *model = (CSWmodel *) inModel;
     CSWinstance *here;
     double g_now;
     int current_state;
 
-    /*  loop through all the switch models */
     for (; model; model = CSWnextModel(model))
-        /* loop through all the instances of the model */
         for (here = CSWinstances(model); here; here = CSWnextInstance(here)) {
 
             current_state = (int) ckt->CKTstates[0][here->CSWstate + 0];
diff --git a/src/spicelib/devices/csw/cswask.c b/src/spicelib/devices/csw/cswask.c
index c6e823475..104c8920c 100644
--- a/src/spicelib/devices/csw/cswask.c
+++ b/src/spicelib/devices/csw/cswask.c
@@ -2,8 +2,6 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1987 Thomas L. Quarles
 **********/
-/*
- */
 
 /*
  * This routine gives access to the internal device parameters
@@ -19,7 +17,6 @@ Author: 1987 Thomas L. Quarles
 #include "ngspice/suffix.h"
 
 
-/* ARGSUSED */
 int
 CSWask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *select)
 {
@@ -69,5 +66,4 @@ CSWask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *s
     default:
         return E_BADPARM;
     }
-    /* NOTREACHED */
 }
diff --git a/src/spicelib/devices/csw/cswload.c b/src/spicelib/devices/csw/cswload.c
index 69aa9ec95..23c722294 100644
--- a/src/spicelib/devices/csw/cswload.c
+++ b/src/spicelib/devices/csw/cswload.c
@@ -15,9 +15,6 @@ Modified: 2001 Jon Engelbert
 
 int
 CSWload(GENmodel *inModel, CKTcircuit *ckt)
-/* actually load the current values into the
- * sparse matrix previously provided
- */
 {
     CSWmodel *model = (CSWmodel *) inModel;
     CSWinstance *here;
@@ -30,9 +27,7 @@ CSWload(GENmodel *inModel, CKTcircuit *ckt)
     double HYST_OFF = 2, HYST_ON = 3;
     /* switch is on or off while control value is in hysteresis region. */
 
-    /*  loop through all the switch models */
     for (; model; model = CSWnextModel(model))
-        /* loop through all the instances of the model */
         for (here = CSWinstances(model); here; here = CSWnextInstance(here)) {
 
             old_current_state = ckt->CKTstates[0][here->CSWstate + 0];
diff --git a/src/spicelib/devices/csw/cswmask.c b/src/spicelib/devices/csw/cswmask.c
index 99bcd3855..ae5f9d693 100644
--- a/src/spicelib/devices/csw/cswmask.c
+++ b/src/spicelib/devices/csw/cswmask.c
@@ -2,8 +2,6 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1987 Thomas L. Quarles
 **********/
-/*
- */
 
 /*
  * This routine gives access to the internal model parameters
@@ -19,7 +17,6 @@ Author: 1987 Thomas L. Quarles
 #include "ngspice/suffix.h"
 
 
-/* ARGSUSED */
 int
 CSWmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
@@ -49,5 +46,4 @@ CSWmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
     default:
         return E_BADPARM;
     }
-    /* NOTREACHED */
 }
diff --git a/src/spicelib/devices/csw/cswmpar.c b/src/spicelib/devices/csw/cswmpar.c
index e38352845..8c6e13a08 100644
--- a/src/spicelib/devices/csw/cswmpar.c
+++ b/src/spicelib/devices/csw/cswmpar.c
@@ -3,8 +3,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Gordon Jacobs
 Modified: 2001 Jon Englebert
 **********/
-/*
- */
 
 #include "ngspice/ngspice.h"
 #include "ngspice/ifsim.h"
diff --git a/src/spicelib/devices/csw/cswparam.c b/src/spicelib/devices/csw/cswparam.c
index 12e526506..b52f1419c 100644
--- a/src/spicelib/devices/csw/cswparam.c
+++ b/src/spicelib/devices/csw/cswparam.c
@@ -2,8 +2,6 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Gordon Jacobs
 **********/
-/*
- */
 
 #include "ngspice/ngspice.h"
 #include "cswdefs.h"
@@ -12,7 +10,6 @@ Author: 1985 Gordon Jacobs
 #include "ngspice/suffix.h"
 
 
-/* ARGSUSED */
 int
 CSWparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
diff --git a/src/spicelib/devices/csw/cswpzld.c b/src/spicelib/devices/csw/cswpzld.c
index 505056778..6f7c587c6 100644
--- a/src/spicelib/devices/csw/cswpzld.c
+++ b/src/spicelib/devices/csw/cswpzld.c
@@ -2,8 +2,6 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Gordon Jacobs
 **********/
-/*
- */
 
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
@@ -13,13 +11,8 @@ Author: 1985 Gordon Jacobs
 #include "ngspice/suffix.h"
 
 
-/* ARGSUSED */
 int
 CSWpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
-/* load the current values into the
- * sparse matrix previously provided
- * during AC analysis
- */
 {
     CSWmodel *model = (CSWmodel *) inModel;
     CSWinstance *here;
@@ -28,9 +21,7 @@ CSWpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
 
     NG_IGNORE(s);
 
-    /*  loop through all the switch models */
     for (; model; model = CSWnextModel(model))
-        /* loop through all the instances of the model */
         for (here = CSWinstances(model); here; here = CSWnextInstance(here)) {
 
             current_state = (int) ckt->CKTstates[0][here->CSWstate + 0];
diff --git a/src/spicelib/devices/csw/cswsetup.c b/src/spicelib/devices/csw/cswsetup.c
index f31b0ae14..b66afee75 100644
--- a/src/spicelib/devices/csw/cswsetup.c
+++ b/src/spicelib/devices/csw/cswsetup.c
@@ -2,8 +2,6 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Gordon Jacobs
 **********/
-/*
- */
 
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
@@ -20,14 +18,10 @@ Author: 1985 Gordon Jacobs
 
 int
 CSWsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
-/* load the switch conductance with those pointers needed later
- * for fast matrix loading
- */
 {
     CSWmodel *model = (CSWmodel *) inModel;
     CSWinstance *here;
 
-    /*  loop through all the current source models */
     for (; model; model = CSWnextModel(model)) {
 
         /* Default Value Processing for Switch Model */
@@ -44,7 +38,6 @@ CSWsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
             model->CSWoffResistance = 1.0 / model->CSWoffConduct;
         }
 
-        /* loop through all the instances of the model */
         for (here = CSWinstances(model); here; here = CSWnextInstance(here)) {
 
             /* Default Value Processing for Switch Instance */
diff --git a/src/spicelib/devices/csw/cswtrunc.c b/src/spicelib/devices/csw/cswtrunc.c
index b32aa4a44..91f4702a5 100644
--- a/src/spicelib/devices/csw/cswtrunc.c
+++ b/src/spicelib/devices/csw/cswtrunc.c
@@ -3,8 +3,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 Modified: 2000 AlansFixes
 **********/
-/*
- */
 
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
diff --git a/src/spicelib/devices/sw/swacload.c b/src/spicelib/devices/sw/swacload.c
index d8c468bf6..a97487d7b 100644
--- a/src/spicelib/devices/sw/swacload.c
+++ b/src/spicelib/devices/sw/swacload.c
@@ -2,8 +2,6 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Gordon Jacobs
 **********/
-/*
- */
 
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
@@ -14,19 +12,13 @@ Author: 1985 Gordon Jacobs
 
 int
 SWacLoad(GENmodel *inModel, CKTcircuit *ckt)
-/* load the current values into the
- * sparse matrix previously provided
- * during AC analysis.
- */
 {
     SWmodel *model = (SWmodel *) inModel;
     SWinstance *here;
     double g_now;
     int current_state;
 
-    /*  loop through all the switch models */
     for (; model; model = SWnextModel(model))
-        /* loop through all the instances of the model */
         for (here = SWinstances(model); here; here = SWnextInstance(here)) {
 
             /* In AC analysis, just propogate the state... */
diff --git a/src/spicelib/devices/sw/swask.c b/src/spicelib/devices/sw/swask.c
index df435a0b0..8c1555c04 100644
--- a/src/spicelib/devices/sw/swask.c
+++ b/src/spicelib/devices/sw/swask.c
@@ -2,8 +2,6 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1987 Thomas L. Quarles
 **********/
-/*
- */
 
 /*
  * This routine gives access to the internal device parameters
@@ -19,7 +17,6 @@ Author: 1987 Thomas L. Quarles
 #include "ngspice/suffix.h"
 
 
-/* ARGSUSED */
 int
 SWask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *select)
 {
@@ -72,5 +69,4 @@ SWask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *se
     default:
         return E_BADPARM;
     }
-    /* NOTREACHED */
 }
diff --git a/src/spicelib/devices/sw/swload.c b/src/spicelib/devices/sw/swload.c
index a06e6fd85..65a0a2c1f 100644
--- a/src/spicelib/devices/sw/swload.c
+++ b/src/spicelib/devices/sw/swload.c
@@ -15,9 +15,6 @@ Modified: 2001 Jon Engelbert
 
 int
 SWload(GENmodel *inModel, CKTcircuit *ckt)
-/* actually load the current values into the
- * sparse matrix previously provided
- */
 {
     SWmodel *model = (SWmodel *) inModel;
     SWinstance *here;
@@ -31,9 +28,7 @@ SWload(GENmodel *inModel, CKTcircuit *ckt)
     //    double previous_region = -1;
     //    double current_region = -1;
 
-    /*  loop through all the switch models */
     for (; model; model = SWnextModel(model))
-        /* loop through all the instances of the model */
         for (here = SWinstances(model); here; here = SWnextInstance(here)) {
 
             old_current_state = ckt->CKTstates[0][here->SWstate + 0];
diff --git a/src/spicelib/devices/sw/swmask.c b/src/spicelib/devices/sw/swmask.c
index eb205e0f2..3fec325d2 100644
--- a/src/spicelib/devices/sw/swmask.c
+++ b/src/spicelib/devices/sw/swmask.c
@@ -2,8 +2,6 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1987 Thomas L. Quarles
 **********/
-/*
- */
 
 /*
  * This routine gives access to the internal model parameter
@@ -19,7 +17,6 @@ Author: 1987 Thomas L. Quarles
 #include "ngspice/suffix.h"
 
 
-/* ARGSUSED */
 int
 SWmAsk(CKTcircuit *ckt, GENmodel *inModel, int which, IFvalue *value)
 {
@@ -49,5 +46,4 @@ SWmAsk(CKTcircuit *ckt, GENmodel *inModel, int which, IFvalue *value)
     default:
         return E_BADPARM;
     }
-    /* NOTREACHED */
 }
diff --git a/src/spicelib/devices/sw/swmparam.c b/src/spicelib/devices/sw/swmparam.c
index e494f6d55..501c54618 100644
--- a/src/spicelib/devices/sw/swmparam.c
+++ b/src/spicelib/devices/sw/swmparam.c
@@ -3,8 +3,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Gordon Jacobs
 Modified: 2001 Jon Engelbert
 **********/
-/*
- */
 
 #include "ngspice/ngspice.h"
 #include "swdefs.h"
diff --git a/src/spicelib/devices/sw/swparam.c b/src/spicelib/devices/sw/swparam.c
index 8ae950990..dd1bd9d0c 100644
--- a/src/spicelib/devices/sw/swparam.c
+++ b/src/spicelib/devices/sw/swparam.c
@@ -2,8 +2,6 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Gordon Jacobs
 **********/
-/*
- */
 
 #include "ngspice/ngspice.h"
 #include "swdefs.h"
@@ -12,7 +10,6 @@ Author: 1985 Gordon Jacobs
 #include "ngspice/suffix.h"
 
 
-/*ARGSUSED*/
 int
 SWparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
diff --git a/src/spicelib/devices/sw/swpzload.c b/src/spicelib/devices/sw/swpzload.c
index 619eb7490..733936e24 100644
--- a/src/spicelib/devices/sw/swpzload.c
+++ b/src/spicelib/devices/sw/swpzload.c
@@ -2,8 +2,6 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Gordon Jacobs
 **********/
-/*
- */
 
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
@@ -13,13 +11,8 @@ Author: 1985 Gordon Jacobs
 #include "ngspice/suffix.h"
 
 
-/* ARGSUSED */
 int
 SWpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
-/* load the current values into the
- * sparse matrix previously provided
- * during AC analysis.
- */
 {
     SWmodel *model = (SWmodel *) inModel;
     SWinstance *here;
@@ -28,9 +21,7 @@ SWpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
 
     NG_IGNORE(s);
 
-    /*  loop through all the switch models */
     for (; model; model = SWnextModel(model))
-        /* loop through all the instances of the model */
         for (here = SWinstances(model); here; here = SWnextInstance(here)) {
 
             /* In AC analysis, just propogate the state... */
diff --git a/src/spicelib/devices/sw/swsetup.c b/src/spicelib/devices/sw/swsetup.c
index 774ab6d0e..50972ae74 100644
--- a/src/spicelib/devices/sw/swsetup.c
+++ b/src/spicelib/devices/sw/swsetup.c
@@ -2,8 +2,6 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Gordon Jacobs
 **********/
-/*
- */
 
 #include "ngspice/ngspice.h"
 #include "ngspice/smpdefs.h"
@@ -21,14 +19,10 @@ Author: 1985 Gordon Jacobs
 
 int
 SWsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
-/* load the switch conductance with those pointers needed later
- * for fast matrix loading
- */
 {
     SWmodel *model = (SWmodel *) inModel;
     SWinstance *here;
 
-    /*  loop through all the current source models */
     for (; model; model = SWnextModel(model)) {
 
         /* Default Value Processing for Switch Model */
@@ -45,7 +39,6 @@ SWsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
             model->SWoffResistance = 1.0 / model->SWoffConduct;
         }
 
-        /* loop through all the instances of the model */
         for (here = SWinstances(model); here; here = SWnextInstance(here)) {
 
             here->SWstate = *states;
diff --git a/src/spicelib/devices/sw/swtrunc.c b/src/spicelib/devices/sw/swtrunc.c
index 9bbc3d447..53511ee8b 100644
--- a/src/spicelib/devices/sw/swtrunc.c
+++ b/src/spicelib/devices/sw/swtrunc.c
@@ -3,8 +3,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 Modified: 2000 AlansFixes
 **********/
-/*
- */
 
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"