diff --git a/src/spicelib/parser/inp2c.c b/src/spicelib/parser/inp2c.c
index 5a926ec45..737df1d6f 100644
--- a/src/spicelib/parser/inp2c.c
+++ b/src/spicelib/parser/inp2c.c
@@ -65,7 +65,6 @@ void INP2C(CKTcircuit *ckt, INPtables * tab, card * current)
       if (INPlookMod(model)) {
           /* If this is a valid model connect it */
           INPinsert(&model, tab);
-          thismodel = NULL;
           current->error = INPgetMod(ckt, model, &thismodel, tab);
           if (thismodel != NULL) {
           if (mytype != thismodel->INPmodType) {
diff --git a/src/spicelib/parser/inp2j.c b/src/spicelib/parser/inp2j.c
index 39dacd03c..9263ba99c 100644
--- a/src/spicelib/parser/inp2j.c
+++ b/src/spicelib/parser/inp2j.c
@@ -46,7 +46,6 @@ void INP2J(CKTcircuit *ckt, INPtables * tab, card * current)
     INPtermInsert(ckt, &nname3, tab, &node3);
     INPgetTok(&line, &model, 1);
     INPinsert(&model, tab);
-    thismodel = NULL;
     current->error = INPgetMod(ckt, model, &thismodel, tab);
     if (thismodel != NULL) {
 	if (thismodel->INPmodType != INPtypelook("JFET")
diff --git a/src/spicelib/parser/inp2l.c b/src/spicelib/parser/inp2l.c
index ea466c9e5..2e1058a88 100644
--- a/src/spicelib/parser/inp2l.c
+++ b/src/spicelib/parser/inp2l.c
@@ -65,7 +65,6 @@ void INP2L(CKTcircuit *ckt, INPtables * tab, card * current)
       if (INPlookMod(model)) {
           /* If this is a valid model connect it */
           INPinsert(&model, tab);
-          thismodel = NULL;
           current->error = INPgetMod(ckt, model, &thismodel, tab);
           if (thismodel != NULL) {
           if (mytype != thismodel->INPmodType) {
diff --git a/src/spicelib/parser/inp2m.c b/src/spicelib/parser/inp2m.c
index 038741380..038eb48b5 100644
--- a/src/spicelib/parser/inp2m.c
+++ b/src/spicelib/parser/inp2m.c
@@ -78,7 +78,6 @@ INP2M (CKTcircuit *ckt, INPtables * tab, card * current)
     INPgetNetTok (&line, &nname5, 1);      /*  get 5th token  */
     save = line; /* saj - save the posn for later if
                   the default mosfet model is used */
-    thismodel = NULL;
 #ifdef TRACE
     printf("INP2M: checking for 4 node device\n");
 #endif
@@ -93,7 +92,6 @@ INP2M (CKTcircuit *ckt, INPtables * tab, card * current)
         /*  5th token is not a model in the table  */
         nodeflag = 1;          /*  now specify a 5 node device  */
         INPgetNetTok (&line, &nname6, 1);   /*  get next token  */
-        thismodel = NULL;
 #ifdef TRACE
         printf("INP2M: checking for 5 node device\n");
 #endif
@@ -103,7 +101,6 @@ INP2M (CKTcircuit *ckt, INPtables * tab, card * current)
             /*  6th token is not a model in the table  */
             nodeflag = 2;              /*  now specify a 6 node device  */
             INPgetNetTok (&line, &nname7, 1);       /*  get next token  */
-            thismodel = NULL;
 #ifdef TRACE
             printf("INP2M: checking for 6 node device\n");
 #endif
@@ -192,7 +189,6 @@ INP2M (CKTcircuit *ckt, INPtables * tab, card * current)
 
 
     INPinsert (&model, tab);
-    thismodel = NULL;
 #ifdef TRACE
     printf("INP2M: Looking up model\n");
 #endif
diff --git a/src/spicelib/parser/inp2n.c b/src/spicelib/parser/inp2n.c
index fbb85d786..e32dde611 100644
--- a/src/spicelib/parser/inp2n.c
+++ b/src/spicelib/parser/inp2n.c
@@ -81,7 +81,6 @@ void INP2N(CKTcircuit *ckt, INPtables * tab, card * current)
 	if (INPlookMod(model)) {
 	    /* If this is a valid model connect it */
 	    INPinsert(&model, tab);
-	    thismodel = NULL;
 	    current->error = INPgetMod(ckt, model, &thismodel, tab);
 	    if (thismodel != NULL) {
 		if (mytype != thismodel->INPmodType) {
diff --git a/src/spicelib/parser/inp2p.c b/src/spicelib/parser/inp2p.c
index da5cc4928..b922cce35 100644
--- a/src/spicelib/parser/inp2p.c
+++ b/src/spicelib/parser/inp2p.c
@@ -83,7 +83,6 @@ int num, i;
     INPgetTok(&line,&model,1);
     if(*model) { /* token isn't null */
             INPinsert(&model,tab);
-            thismodel = NULL;
             current->error = INPgetMod(ckt,model,&thismodel,tab);
             if(thismodel != NULL) {
                     if(mytype != thismodel->INPmodType) {
diff --git a/src/spicelib/parser/inp2r.c b/src/spicelib/parser/inp2r.c
index 4659f1f76..57ff19d89 100644
--- a/src/spicelib/parser/inp2r.c
+++ b/src/spicelib/parser/inp2r.c
@@ -147,7 +147,6 @@ void INP2R(CKTcircuit *ckt, INPtables * tab, card * current)
           printf("In INP2R, Valid R Model: %s\n", model);
 #endif
           INPinsert(&model, tab);
-          thismodel = NULL;
           current->error = INPgetMod(ckt, model, &thismodel, tab);
           if (thismodel != NULL) {
             if (mytype != thismodel->INPmodType) {
diff --git a/src/spicelib/parser/inp2y.c b/src/spicelib/parser/inp2y.c
index ea7b01a44..385ff4bb4 100644
--- a/src/spicelib/parser/inp2y.c
+++ b/src/spicelib/parser/inp2y.c
@@ -72,7 +72,6 @@ int lenvalgiven = 0;
     INPgetTok(&line,&model,1);
     if(*model) { /* token isn't null */
             INPinsert(&model,tab);
-            thismodel = NULL;
             current->error = INPgetMod(ckt,model,&thismodel,tab);
             INPgetTok(&line,&model,1);
             if (strcmp(model, "len") == 0) {
diff --git a/src/spicelib/parser/inp2z.c b/src/spicelib/parser/inp2z.c
index 24a25e21c..7624fdd7e 100644
--- a/src/spicelib/parser/inp2z.c
+++ b/src/spicelib/parser/inp2z.c
@@ -54,7 +54,6 @@ void INP2Z(CKTcircuit *ckt, INPtables * tab, card * current)
     INPtermInsert(ckt, &nname3, tab, &node3);
     INPgetTok(&line, &model, 1);
     INPinsert(&model, tab);
-    thismodel = NULL;
     current->error = INPgetMod(ckt, model, &thismodel, tab);
     if (thismodel != NULL) {
 		if (   thismodel->INPmodType != INPtypelook("MES")