summaryrefslogtreecommitdiff
path: root/src/deviceModelLibrary
diff options
context:
space:
mode:
Diffstat (limited to 'src/deviceModelLibrary')
-rw-r--r--src/deviceModelLibrary/Diode/D.lib2
-rw-r--r--src/deviceModelLibrary/Diode/D.xml15
-rw-r--r--src/deviceModelLibrary/Diode/LED.lib2
-rw-r--r--src/deviceModelLibrary/Diode/LED.xml1
-rw-r--r--src/deviceModelLibrary/Diode/PowerDiode.lib20
-rw-r--r--src/deviceModelLibrary/Diode/PowerDiode.xml1
-rw-r--r--src/deviceModelLibrary/Diode/ZenerD1N750.lib3
-rw-r--r--src/deviceModelLibrary/Diode/ZenerD1N750.xml24
-rw-r--r--src/deviceModelLibrary/IGBT/NIGBT.lib11
-rw-r--r--src/deviceModelLibrary/IGBT/NIGBT.xml4
-rw-r--r--src/deviceModelLibrary/IGBT/PIGBT.lib10
-rw-r--r--src/deviceModelLibrary/IGBT/PIGBT.xml15
-rw-r--r--src/deviceModelLibrary/JFET/NJF.lib4
-rw-r--r--src/deviceModelLibrary/JFET/NJF.xml29
-rw-r--r--src/deviceModelLibrary/JFET/PJF.lib5
-rw-r--r--src/deviceModelLibrary/JFET/PJF.xml27
-rw-r--r--src/deviceModelLibrary/MOS/NMOS-0.5um.lib6
-rw-r--r--src/deviceModelLibrary/MOS/NMOS-0.5um.xml32
-rw-r--r--src/deviceModelLibrary/MOS/NMOS-180nm.lib13
-rw-r--r--src/deviceModelLibrary/MOS/NMOS-180nm.xml112
-rw-r--r--src/deviceModelLibrary/MOS/NMOS-5um.lib5
-rw-r--r--src/deviceModelLibrary/MOS/NMOS-5um.xml24
-rw-r--r--src/deviceModelLibrary/MOS/PMOS-0.5um.lib6
-rw-r--r--src/deviceModelLibrary/MOS/PMOS-0.5um.xml32
-rw-r--r--src/deviceModelLibrary/MOS/PMOS-180nm.lib11
-rw-r--r--src/deviceModelLibrary/MOS/PMOS-180nm.xml112
-rw-r--r--src/deviceModelLibrary/MOS/PMOS-5um.lib5
-rw-r--r--src/deviceModelLibrary/MOS/PMOS-5um.xml23
-rw-r--r--src/deviceModelLibrary/Misc/CORE.lib9
-rw-r--r--src/deviceModelLibrary/Misc/CORE.xml4
-rw-r--r--src/deviceModelLibrary/Templates/CORE.lib9
-rw-r--r--src/deviceModelLibrary/Templates/CORE.xml4
-rw-r--r--src/deviceModelLibrary/Templates/D.lib2
-rw-r--r--src/deviceModelLibrary/Templates/D.xml15
-rw-r--r--src/deviceModelLibrary/Templates/NIGBT.lib10
-rw-r--r--src/deviceModelLibrary/Templates/NIGBT.xml15
-rw-r--r--src/deviceModelLibrary/Templates/NJF.lib4
-rw-r--r--src/deviceModelLibrary/Templates/NJF.xml29
-rw-r--r--src/deviceModelLibrary/Templates/NMOS-0.5um.lib6
-rw-r--r--src/deviceModelLibrary/Templates/NMOS-0.5um.xml32
-rw-r--r--src/deviceModelLibrary/Templates/NMOS-180nm.lib13
-rw-r--r--src/deviceModelLibrary/Templates/NMOS-180nm.xml112
-rw-r--r--src/deviceModelLibrary/Templates/NMOS-5um.lib5
-rw-r--r--src/deviceModelLibrary/Templates/NMOS-5um.xml24
-rw-r--r--src/deviceModelLibrary/Templates/NPN.lib4
-rw-r--r--src/deviceModelLibrary/Templates/NPN.xml33
-rw-r--r--src/deviceModelLibrary/Templates/PIGBT.lib10
-rw-r--r--src/deviceModelLibrary/Templates/PIGBT.xml15
-rw-r--r--src/deviceModelLibrary/Templates/PJF.lib5
-rw-r--r--src/deviceModelLibrary/Templates/PJF.xml27
-rw-r--r--src/deviceModelLibrary/Templates/PMOS-0.5um.lib6
-rw-r--r--src/deviceModelLibrary/Templates/PMOS-0.5um.xml32
-rw-r--r--src/deviceModelLibrary/Templates/PMOS-180nm.lib11
-rw-r--r--src/deviceModelLibrary/Templates/PMOS-180nm.xml112
-rw-r--r--src/deviceModelLibrary/Templates/PMOS-5um.lib5
-rw-r--r--src/deviceModelLibrary/Templates/PMOS-5um.xml23
-rw-r--r--src/deviceModelLibrary/Templates/PNP.lib4
-rw-r--r--src/deviceModelLibrary/Templates/PNP.xml33
-rw-r--r--src/deviceModelLibrary/Transistor/BC547B.lib1
-rw-r--r--src/deviceModelLibrary/Transistor/BC547B.xml1
-rw-r--r--src/deviceModelLibrary/Transistor/NPN.lib4
-rw-r--r--src/deviceModelLibrary/Transistor/NPN.xml1
-rw-r--r--src/deviceModelLibrary/Transistor/PNP.lib4
-rw-r--r--src/deviceModelLibrary/Transistor/PNP.xml33
-rw-r--r--src/deviceModelLibrary/User Libraries/IN4002.lib5
-rw-r--r--src/deviceModelLibrary/User Libraries/IN4002.xml1
-rw-r--r--src/deviceModelLibrary/User Libraries/ddnpn.lib29
-rw-r--r--src/deviceModelLibrary/User Libraries/ddnpn.xml1
-rw-r--r--src/deviceModelLibrary/User Libraries/ddpnp.lib29
-rw-r--r--src/deviceModelLibrary/User Libraries/ddpnp.xml1
-rw-r--r--src/deviceModelLibrary/User Libraries/emitter.lib4
-rw-r--r--src/deviceModelLibrary/User Libraries/emitter.xml1
-rw-r--r--src/deviceModelLibrary/User Libraries/npn_1.lib29
-rw-r--r--src/deviceModelLibrary/User Libraries/pnp_1.lib29
-rw-r--r--src/deviceModelLibrary/User Libraries/userDiode.lib20
-rw-r--r--src/deviceModelLibrary/User Libraries/userDiode.xml1
76 files changed, 0 insertions, 1361 deletions
diff --git a/src/deviceModelLibrary/Diode/D.lib b/src/deviceModelLibrary/Diode/D.lib
deleted file mode 100644
index 8a7fb4da..00000000
--- a/src/deviceModelLibrary/Diode/D.lib
+++ /dev/null
@@ -1,2 +0,0 @@
-.model 1n4148 D(is=2.495E-09 rs=4.755E-01 n=1.679E+00 tt=3.030E-09 cjo=1.700E-12 vj=1 m=1.959E-01 bv=1.000E+02 ibv=1.000E-04)
-
diff --git a/src/deviceModelLibrary/Diode/D.xml b/src/deviceModelLibrary/Diode/D.xml
deleted file mode 100644
index 8b6b14c8..00000000
--- a/src/deviceModelLibrary/Diode/D.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<library>
-<model_name>D</model_name>
-<ref_model>1N4148</ref_model>
-<param>
- <Is>2.495E-09</Is>
- <Rs>4.755E-01</Rs>
- <N>1.679E+00</N>
- <tt>3.030E-09</tt>
- <Cjo>1.700E-12</Cjo>
- <M>1.959E-01</M>
- <Vj>1</Vj>
- <Bv>1.000E+02</Bv>
- <Ibv>1.000E-04</Ibv>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Diode/LED.lib b/src/deviceModelLibrary/Diode/LED.lib
deleted file mode 100644
index 000831b2..00000000
--- a/src/deviceModelLibrary/Diode/LED.lib
+++ /dev/null
@@ -1,2 +0,0 @@
-.model LED D(is=4.36625E-25 rs=3.00014 n=1.38167 tt=3.030E-09 cjo=1.700E-12 vj=1 m=1.959E-01 bv=1.000E+02 ibv=1.000E-04)
-
diff --git a/src/deviceModelLibrary/Diode/LED.xml b/src/deviceModelLibrary/Diode/LED.xml
deleted file mode 100644
index 91eb9169..00000000
--- a/src/deviceModelLibrary/Diode/LED.xml
+++ /dev/null
@@ -1 +0,0 @@
-<library><model_name>D</model_name><ref_model>LED</ref_model><param><cjo>1.700E-12</cjo><rs>4.755E-01</rs><is>2.495E-09</is><m>1.959E-01</m><n>1.679E00</n><bv>1.000E02</bv><ibv>1.000E-04</ibv><tt>3.030E-09</tt><vj>1</vj></param></library> \ No newline at end of file
diff --git a/src/deviceModelLibrary/Diode/PowerDiode.lib b/src/deviceModelLibrary/Diode/PowerDiode.lib
deleted file mode 100644
index a2f61dce..00000000
--- a/src/deviceModelLibrary/Diode/PowerDiode.lib
+++ /dev/null
@@ -1,20 +0,0 @@
-.MODEL PowerDiode D(
-+ Vj=.75
-+ Nbvl=14.976
-+ Cjo=175p
-+ Rs=.25
-+ Isr=1.859n
-+ Eg=1.11
-+ M=.5516
-+ Nbv=1.6989
-+ N=1
-+ Tbv1=-21.277u
-+ bv=1800
-+ Fc=.5
-+ Ikf=0
-+ Nr=2
-+ Ibv=20.245m
-+ Is=2.2E-15
-+ Xti=3
-+ Ibvl=1.9556m
-) \ No newline at end of file
diff --git a/src/deviceModelLibrary/Diode/PowerDiode.xml b/src/deviceModelLibrary/Diode/PowerDiode.xml
deleted file mode 100644
index 06dceda1..00000000
--- a/src/deviceModelLibrary/Diode/PowerDiode.xml
+++ /dev/null
@@ -1 +0,0 @@
-<library><model_name>D</model_name><ref_model>PowerDiode</ref_model><param><Vj>.75</Vj><Nbvl>14.976</Nbvl><Cjo>175p</Cjo><Rs>.25</Rs><Isr>1.859n</Isr><Eg>1.11</Eg><M>.5516</M><Nbv>1.6989</Nbv><N>1</N><Tbv1>-21.277u</Tbv1><bv>1800</bv><Fc>.5</Fc><Ikf>0</Ikf><Nr>2</Nr><Ibv>20.245m</Ibv><Is>2.2E-15</Is><Xti>3</Xti><Ibvl>1.9556m</Ibvl></param></library> \ No newline at end of file
diff --git a/src/deviceModelLibrary/Diode/ZenerD1N750.lib b/src/deviceModelLibrary/Diode/ZenerD1N750.lib
deleted file mode 100644
index 890c37fe..00000000
--- a/src/deviceModelLibrary/Diode/ZenerD1N750.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-.model D1N750 D( Is=880.5E-18 Rs=.25 Ikf=0 N=1 Xti=3 Eg=1.11 Cjo=175p M=.5516
-+ Vj=.75 Fc=.5 Isr=1.859n Nr=2 Bv=8.1 Ibv=20.245m Nbv=1.6989 Ibvl=1.9556m
-+ Nbvl=14.976 Tbv1=-21.277u)
diff --git a/src/deviceModelLibrary/Diode/ZenerD1N750.xml b/src/deviceModelLibrary/Diode/ZenerD1N750.xml
deleted file mode 100644
index 546d1156..00000000
--- a/src/deviceModelLibrary/Diode/ZenerD1N750.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<library>
-<model_name>D</model_name>
-<ref_model>D1N750</ref_model>
-<param>
- <Is>880.5E-18</Is>
- <Rs>.25</Rs>
- <Ikf>0</Ikf>
- <N>1</N>
- <Xti>3</Xti>
- <Eg>1.11</Eg>
- <Cjo>175p</Cjo>
- <M>.5516</M>
- <Vj>.75</Vj>
- <Fc>.5</Fc>
- <Isr>1.859n</Isr>
- <Nr>2</Nr>
- <Bv>8.1</Bv>
- <Ibv>20.245m</Ibv>
- <Nbv>1.6989</Nbv>
- <Ibvl>1.9556m</Ibvl>
- <Nbvl>14.976</Nbvl>
- <Tbv1>-21.277u</Tbv1>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/IGBT/NIGBT.lib b/src/deviceModelLibrary/IGBT/NIGBT.lib
deleted file mode 100644
index 86cd1b4e..00000000
--- a/src/deviceModelLibrary/IGBT/NIGBT.lib
+++ /dev/null
@@ -1,11 +0,0 @@
-.MODEL IXGH40N60 NIGBT(
-+ TAU=287.56E-9
-+ KF=.36047
-+ AREA=37.500E-6
-+ AGD=18.750E-6
-+ KP=50.034
-+ VT=4.1822
-+ CGS=31.942E-9
-+ COXD=53.188E-9
-+ VTD=2.6570
-) \ No newline at end of file
diff --git a/src/deviceModelLibrary/IGBT/NIGBT.xml b/src/deviceModelLibrary/IGBT/NIGBT.xml
deleted file mode 100644
index 38d9d094..00000000
--- a/src/deviceModelLibrary/IGBT/NIGBT.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<library>
-<model_name>NIGBT</model_name>
-<ref_model>IXGH40N60</ref_model>
-<param><TAU>287.56E-9</TAU><KF>.36047</KF><AREA>37.500E-6</AREA><AGD>18.750E-6</AGD><KP>50.034</KP><VT>4.1822</VT><CGS>31.942E-9</CGS><COXD>53.188E-9</COXD><VTD>2.6570</VTD></param></library> \ No newline at end of file
diff --git a/src/deviceModelLibrary/IGBT/PIGBT.lib b/src/deviceModelLibrary/IGBT/PIGBT.lib
deleted file mode 100644
index d4f9e814..00000000
--- a/src/deviceModelLibrary/IGBT/PIGBT.lib
+++ /dev/null
@@ -1,10 +0,0 @@
-.MODEL IXGH40N60 PIGBT (
-+ TAU=287.56E-9
-+ KP=50.034
-+ AREA=37.500E-6
-+ AGD=18.750E-6
-+ VT=4.1822
-+ KF=.36047
-+ CGS=31.942E-9
-+ COXD=53.188E-9
-+ VTD=2.6570)
diff --git a/src/deviceModelLibrary/IGBT/PIGBT.xml b/src/deviceModelLibrary/IGBT/PIGBT.xml
deleted file mode 100644
index 1e57f2e3..00000000
--- a/src/deviceModelLibrary/IGBT/PIGBT.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<library>
-<model_name>PIGBT</model_name>
-<ref_model>IXGH40N60</ref_model>
-<param>
-<TAU>287.56E-9</TAU>
-<KP>50.034</KP>
-<AREA>37.500E-6</AREA>
-<AGD>18.750E-6</AGD>
-<VT>4.1822</VT>
-<KF>.36047</KF>
-<CGS>31.942E-9</CGS>
-<COXD>53.188E-9</COXD>
-<VTD>2.6570 </VTD>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/JFET/NJF.lib b/src/deviceModelLibrary/JFET/NJF.lib
deleted file mode 100644
index dbb2cbae..00000000
--- a/src/deviceModelLibrary/JFET/NJF.lib
+++ /dev/null
@@ -1,4 +0,0 @@
-.model J2N3819 NJF(Beta=1.304m Betatce=-.5 Rd=1 Rs=1 Lambda=2.25m Vto=-3
-+ Vtotc=-2.5m Is=33.57f Isr=322.4f N=1 Nr=2 Xti=3 Alpha=311.7u
-+ Vk=243.6 Cgd=1.6p M=.3622 Pb=1 Fc=.5 Cgs=2.414p Kf=9.882E-18
-+ Af=1)
diff --git a/src/deviceModelLibrary/JFET/NJF.xml b/src/deviceModelLibrary/JFET/NJF.xml
deleted file mode 100644
index 94753691..00000000
--- a/src/deviceModelLibrary/JFET/NJF.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<library>
-<model_name>NJF</model_name>
-<ref_model>J2N3819</ref_model>
-<param>
-<Beta>1.304m</Beta>
-<Betatce>-.5</Betatce>
-<Rd>1 </Rd>
-<Rs>1 </Rs>
-<Lambda>2.25m</Lambda>
-<Vto>-3</Vto>
-<Vtotc>-2.5m</Vtotc>
-<Is>33.57f </Is>
-<Isr>322.4f </Isr>
-<N>1</N>
-<Nr>2</Nr>
-<Xti>3</Xti>
-<Alpha>311.7u</Alpha>
-<Vk>243.6 </Vk>
-<Cgd>1.6p </Cgd>
-<M>.3622 </M>
-<Pb>1</Pb>
-<Fc>.5</Fc>
-<Cgs>2.414p</Cgs>
-<Kf>9.882E-18</Kf>
-<Af>1</Af>
-
-
-</param>
-</library>
diff --git a/src/deviceModelLibrary/JFET/PJF.lib b/src/deviceModelLibrary/JFET/PJF.lib
deleted file mode 100644
index 5589571d..00000000
--- a/src/deviceModelLibrary/JFET/PJF.lib
+++ /dev/null
@@ -1,5 +0,0 @@
-.model J2N3820 PJF(Beta=1.304m Betatce=-.5 Rd=1 Rs=1 Lambda=2.25m Vto=-3
-+ Vtotc=-2.5m Is=33.57f Isr=322.4f N=1 Nr=2 Xti=3 Alpha=311.7u
-+ Vk=243.6 Cgd=1.6p M=.3622 Pb=1 Fc=.5 Cgs=2.414p Kf=9.882E-18
-+ Af=1)
-
diff --git a/src/deviceModelLibrary/JFET/PJF.xml b/src/deviceModelLibrary/JFET/PJF.xml
deleted file mode 100644
index f682f8cb..00000000
--- a/src/deviceModelLibrary/JFET/PJF.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<library>
-<model_name>PJF</model_name>
-<ref_model>J2N3820</ref_model>
-<param>
-<Beta>1.304m </Beta>
-<Betatce>-.5</Betatce>
-<Rd>1 </Rd>
-<Rs>1 </Rs>
-<Lambda>2.25m</Lambda>
-<Vto>-3</Vto>
-<Vtotc>-2.5m </Vtotc>
-<Is>33.57f </Is>
-<Isr>322.4f</Isr>
-<N>1 </N>
-<Nr>2 </Nr>
-<Xti>3 </Xti>
-<Alpha>311.7u</Alpha>
-<Vk>243.6 </Vk>
-<Cgd>1.6p </Cgd>
-<M>.3622 </M>
-<Pb>1 </Pb>
-<Fc>.5 </Fc>
-<Cgs>2.414p </Cgs>
-<Kf>9.882E-18</Kf>
-<Af>1</Af>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/MOS/NMOS-0.5um.lib b/src/deviceModelLibrary/MOS/NMOS-0.5um.lib
deleted file mode 100644
index 2e6f4635..00000000
--- a/src/deviceModelLibrary/MOS/NMOS-0.5um.lib
+++ /dev/null
@@ -1,6 +0,0 @@
-.model mos_n NMOS( TPG=1 TOX=9.5n CJ=550u ETA=0.02125 VMAX=1.8E05
-+ GAMMA=0.62 CGSO=0.3n LD=50n MJSW=0.35 PB=1.1
-+ CGBO=0.45n XJ=0.2U CGDO=0.3n KAPPA=0.1 LEVEL=3
-+ VTO=0.6 NFS=7.20E11 THETA=0.23 CJSW=0.3n PHI=0.7
-+ RSH=2.0 MJ=0.6 UO=420 KP=156u DELTA=0.88
-+ NSUB=1.40E17 ) \ No newline at end of file
diff --git a/src/deviceModelLibrary/MOS/NMOS-0.5um.xml b/src/deviceModelLibrary/MOS/NMOS-0.5um.xml
deleted file mode 100644
index 08fdf0e3..00000000
--- a/src/deviceModelLibrary/MOS/NMOS-0.5um.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<library>
-<model_name>NMOS</model_name>
-<ref_model>mos_n</ref_model>
-<param>
-<TPG>1</TPG>
-<TOX>9.5n </TOX>
-<CJ>550u </CJ>
-<ETA>0.02125 </ETA>
-<VMAX>1.8E05</VMAX>
-<GAMMA>0.62</GAMMA>
-<CGSO>0.3n </CGSO>
-<LD>50n </LD>
-<MJSW>0.35 </MJSW>
-<PB>1.1</PB>
-<CGBO>0.45n </CGBO>
-<XJ>0.2U </XJ>
-<CGDO>0.3n </CGDO>
-<KAPPA>0.1 </KAPPA>
-<LEVEL>3 </LEVEL>
-<VTO>0.6 </VTO>
-<NFS>7.20E11 </NFS>
-<THETA>0.23 </THETA>
-<CJSW>0.3n </CJSW>
-<PHI>0.7 </PHI>
-<RSH>2.0 </RSH>
-<MJ>0.6 </MJ>
-<UO>420</UO>
-<KP>156u </KP>
-<DELTA>0.88</DELTA>
-<NSUB>1.40E17</NSUB>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/MOS/NMOS-180nm.lib b/src/deviceModelLibrary/MOS/NMOS-180nm.lib
deleted file mode 100644
index 51e9b119..00000000
--- a/src/deviceModelLibrary/MOS/NMOS-180nm.lib
+++ /dev/null
@@ -1,13 +0,0 @@
-.model CMOSN NMOS (LEVEL=8 VERSION=3.2 TNOM=27 TOX=4.1E-9 XJ=1E-7 NCH=2.3549E17 VTH0=0.3823463 K1=0.5810697
-+ K2=4.774618E-3 K3=0.0431669 K3B=1.1498346 W0=1E-7 NLX=1.910552E-7 DVT0W=0 DVT1W=0 DVT2W=0
-+ DVT0=1.2894824 DVT1=0.3622063 DVT2=0.0713729 U0=280.633249 UA=-1.208537E-9 UB=2.158625E-18
-+ UC=5.342807E-11 VSAT=9.366802E4 A0=1.7593146 AGS=0.3939741 B0=-6.413949E-9 B1=-1E-7 KETA=-5.180424E-4
-+ A1=0 A2=1 RDSW=105.5517558 PRWG=0.5 PRWB=-0.1998871 WR=1 WINT=7.904732E-10 LINT=1.571424E-8 XL=0
-+ XW=-1E-8 DWG=1.297221E-9 DWB=1.479041E-9 VOFF=-0.0955434 NFACTOR=2.4358891 CIT=0 CDSC=2.4E-4 CDSCD=0
-+ CDSCB=0 ETA0=3.104851E-3 ETAB=-2.512384E-5 DSUB=0.0167075 PCLM=0.8073191 PDIBLC1=0.1666161 PDIBLC2=3.112892E-3
-+ PDIBLCB=-0.1 DROUT=0.7875618 PSCBE1=8E10 PSCBE2=9.213635E-10 PVAG=3.85243E-3 DELTA=0.01 RSH=6.7 MOBMOD=1
-+ PRT=0 UTE=-1.5 KT1=-0.11 KT1L=0 KT2=0.022 UA1=4.31E-9 UB1=-7.61E-18 UC1=-5.6E-11 AT=3.3E4 WL=0 WLN=1
-+ WW=0 WWN=1 WWL=0 LL=0 LLN=1 LW=0 LWN=1 LWL=0 CAPMOD=2 XPART=0.5 CGDO=7.08E-10 CGSO=7.08E-10 CGBO=1E-12
-+ CJ=9.68858E-4 PB=0.8 MJ=0.3864502 CJSW=2.512138E-10 PBSW=0.809286 MJSW=0.1060414 CJSWG=3.3E-10 PBSWG=0.809286
-+ MJSWG=0.1060414 CF=0 PVTH0=-1.192722E-3 PRDSW=-5 PK2=6.450505E-5 WKETA=-4.27294E-4 LKETA=-0.0104078
-+ PU0=6.3268729 PUA=2.226552E-11 PUB=0 PVSAT=969.1480157 PETA0=1E-4 PKETA=-1.049509E-3)
diff --git a/src/deviceModelLibrary/MOS/NMOS-180nm.xml b/src/deviceModelLibrary/MOS/NMOS-180nm.xml
deleted file mode 100644
index d0249bb6..00000000
--- a/src/deviceModelLibrary/MOS/NMOS-180nm.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<library>
-<model_name>NMOS</model_name>
-<ref_model>CMOSN</ref_model>
-<param>
-<LEVEL>8 </LEVEL>
-<VERSION>3.2 </VERSION>
-<TNOM>27 </TNOM>
-<TOX>4.1E-9 </TOX>
-<XJ>1E-7 </XJ>
-<NCH>2.3549E17 </NCH>
-<VTH0>0.3823463 </VTH0>
-<K1>0.5810697 </K1>
-<K2>4.774618E-3 </K2>
-<K3>0.0431669 </K3>
-<K3B>1.1498346</K3B>
-<W0>1E-7 </W0>
-<NLX>1.910552E-7 </NLX>
-<DVT0W>0 </DVT0W>
-<DVT1W>0 </DVT1W>
-<DVT2W>0 </DVT2W>
-<DVT0>1.2894824 </DVT0>
-<DVT1>0.3622063 </DVT1>
-<DVT2>0.0713729 </DVT2>
-<U0>280.633249 </U0>
-<UA>-1.208537E-9 </UA>
-<UB>2.158625E-18</UB>
-<UC>5.342807E-11 </UC>
-<VSAT>9.366802E4</VSAT>
-<A0>1.7593146 </A0>
-<AGS>0.3939741 </AGS>
-<B0>-6.413949E-9 </B0>
-<B1>-1E-7 </B1>
-<KETA>-5.180424E-4</KETA>
-<A1>0 </A1>
-<A2>1 </A2>
-<RDSW>105.5517558</RDSW>
-<PRWG>0.5 </PRWG>
-<PRWB>-0.1998871 </PRWB>
-<WR>1 </WR>
-<WINT>7.904732E-10 </WINT>
-<LINT>1.571424E-8 </LINT>
-<XL>0</XL>
-<XW>-1E-8 </XW>
-<DWG>1.297221E-9 </DWG>
-<DWB>1.479041E-9</DWB>
-<VOFF>-0.0955434 </VOFF>
-<NFACTOR>2.4358891 </NFACTOR>
-<CIT>0 </CIT>
-<CDSC>2.4E-4 </CDSC>
-<CDSCD>0</CDSCD>
-<CDSCB>0 </CDSCB>
-<ETA0>=3.104851E-3 </ETA0>
-<ETAB>-2.512384E-5 </ETAB>
-<DSUB>0.0167075 </DSUB>
-<PCLM>0.8073191 </PCLM>
-<PDIBLC1>0.1666161 </PDIBLC1>
-<PDIBLC2>3.112892E-3 </PDIBLC2>
-<PDIBLCB>-0.1 </PDIBLCB>
-<DROUT>0.7875618 </DROUT>
-<PSCBE1>8E10 </PSCBE1>
-<PSCBE2>9.213635E-10 </PSCBE2>
-<PVAG>3.85243E-3 </PVAG>
-<DELTA>0.01 </DELTA>
-<RSH>6.7 </RSH>
-<MOBMOD>1</MOBMOD>
-<PRT>0 </PRT>
-<UTE>-1.5 </UTE>
-<KT1>-0.11 </KT1>
-<KT1L>0 </KT1L>
-<KT2>0.022 </KT2>
-<UA1>4.31E-9 </UA1>
-<UB1>-7.61E-18 </UB1>
-<UC1>-5.6E-11 </UC1>
-<AT>3.3E4 </AT>
-<WL>0 </WL>
-<WLN>1</WLN>
-<WW>0 </WW>
-<WWN>1 </WWN>
-<WWL>0 </WWL>
-<LL>0 </LL>
-<LLN>1 </LLN>
-<LW>0 </LW>
-<LWN>1 </LWN>
-<LWL>0 </LWL>
-<CAPMOD>2 </CAPMOD>
-<XPART>0.5 </XPART>
-<CGDO>7.08E-10 </CGDO>
-<CGSO>7.08E-10 </CGSO>/
-<CGBO>1E-12</CGBO>
-<CJ>9.68858E-4 </CJ>
-<PB>0.8 </PB>
-<MJ>0.3864502 </MJ>
-<CJSW>2.512138E-10 </CJSW>
-<PBSW>0.809286 </PBSW>
-<MJSW>0.1060414 </MJSW>
-<CJSWG>3.3E-10 </CJSWG>
-<PBSWG>0.809286 </PBSWG>
-<MJSWG>0.1060414 </MJSWG>
-<CF>0 </CF>
-<PVTH0>-1.192722E-3 </PVTH0>
-<PRDSW>-5 </PRDSW>
-<PK2>6.450505E-5 </PK2>
-<WKETA>-4.27294E-4 </WKETA>
-<LKETA>-0.0104078 </LKETA>
-<PU0>6.3268729 </PU0>
-<PUA>2.226552E-11 </PUA>
-<PUB>0 </PUB>
-<PVSAT>969.1480157</PVSAT>
-<PETA0>1E-4 </PETA0>
-<PKETA>-1.049509E-3</PKETA>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/MOS/NMOS-5um.lib b/src/deviceModelLibrary/MOS/NMOS-5um.lib
deleted file mode 100644
index a237e1fe..00000000
--- a/src/deviceModelLibrary/MOS/NMOS-5um.lib
+++ /dev/null
@@ -1,5 +0,0 @@
-* 5um technology
-
-.model mos_n NMOS( Cgso=0.4n Tox=85n Vto=1 phi=0.7
-+ Level=1
-+ Mj=.5 UO=750 Cgdo=0.4n Gamma=1.4 LAMBDA=0.01 LD=0.7u JS=1u CJ=0.4m CJSW=0.8n MJSW=0.5 PB=0.7 CGBO=0.2n )
diff --git a/src/deviceModelLibrary/MOS/NMOS-5um.xml b/src/deviceModelLibrary/MOS/NMOS-5um.xml
deleted file mode 100644
index 358fbdbe..00000000
--- a/src/deviceModelLibrary/MOS/NMOS-5um.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<library>
-<model_name>NMOS</model_name>
-<ref_model>mos_n</ref_model>
-<param>
-<Cgso>0.4n</Cgso>
-<Tox>85n</Tox>
-<Vto>1</Vto>
-<phi>0.7</phi>
-<Level>1</Level>
-<Mj>.5</Mj>
-<UO>750</UO>
-<Cgdo>0.4n</Cgdo>
-<Gamma>1.4</Gamma>
-<LAMBDA>0.01 </LAMBDA>
-<LD>0.7u </LD>
-<JS>1u </JS>
-<CJ>0.4m</CJ>
-<CJSW>0.8n</CJSW>
-<MJSW>0.5 </MJSW>
-<PB>0.7</PB>
-<CGBO>0.2n</CGBO>
-
-</param>
-</library>
diff --git a/src/deviceModelLibrary/MOS/PMOS-0.5um.lib b/src/deviceModelLibrary/MOS/PMOS-0.5um.lib
deleted file mode 100644
index 848e8b05..00000000
--- a/src/deviceModelLibrary/MOS/PMOS-0.5um.lib
+++ /dev/null
@@ -1,6 +0,0 @@
-.model mos_p PMOS( TPG=-1 TOX=9.5n CJ=950u ETA=0.025 VMAX=0.3u
-+ GAMMA=0.52 CGSO=0.35n LD=70n MJSW=0.25 PB=1
-+ CGBO=0.45n XJ=0.2U CGDO=0.35n KAPPA=8.0 LEVEL=3
-+ VTO=-0.6 NFS=6.50E11 THETA=0.2 CJSW=0.2n PHI=0.7
-+ RSH=2.5 MJ=0.5 UO=130 KP=48u DELTA=0.25
-+ NSUB=1.0E17 ) \ No newline at end of file
diff --git a/src/deviceModelLibrary/MOS/PMOS-0.5um.xml b/src/deviceModelLibrary/MOS/PMOS-0.5um.xml
deleted file mode 100644
index 013d461c..00000000
--- a/src/deviceModelLibrary/MOS/PMOS-0.5um.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<library>
-<model_name>PMOS</model_name>
-<ref_model>mos_p</ref_model>
-<param>
-<TPG>-1 </TPG>
-<TOX>9.5n </TOX>
-<CJ>950u </CJ>
-<ETA>0.025 </ETA>
-<VMAX>0.3u </VMAX>
-<GAMMA>0.52 </GAMMA>
-<CGSO>0.35n </CGSO>
-<LD>70n </LD>
-<MJSW>0.25 </MJSW>
-<PB>1 </PB>
-<CGBO>0.45n </CGBO>
-<XJ>0.2U </XJ>
-<CGDO>0.35n </CGDO>
-<KAPPA>8.0 </KAPPA>
-<LEVEL>3 </LEVEL>
-<VTO>-0.6 </VTO>
-<NFS>6.50E11 </NFS>
-<THETA>0.2 </THETA>
-<CJSW>0.2n </CJSW>
-<PHI>0.7 </PHI>
-<RSH>2.5 </RSH>
-<MJ>0.5</MJ>
-<UO>130 </UO>
-<KP>48u </KP>
-<DELTA>0.25 </DELTA>
-<NSUB>1.0E17</NSUB>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/MOS/PMOS-180nm.lib b/src/deviceModelLibrary/MOS/PMOS-180nm.lib
deleted file mode 100644
index 032b5b95..00000000
--- a/src/deviceModelLibrary/MOS/PMOS-180nm.lib
+++ /dev/null
@@ -1,11 +0,0 @@
-.model CMOSP PMOS (LEVEL=8 VERSION=3.2 TNOM=27 TOX=4.1E-9 XJ=1E-7 NCH=4.1589E17 VTH0=-0.3938813 K1=0.5479015
-+ K2=0.0360586 K3=0.0993095 K3B=5.7086622 W0=1E-6 NLX=1.313191E-7 DVT0W=0 DVT1W=0 DVT2W=0 DVT0=0.4911363
-+ DVT1=0.2227356 DVT2=0.1 U0=115.6852975 UA=1.505832E-9 UB=1E-21 UC=-1E-10 VSAT=1.329694E5 A0=1.7590478
-+ AGS=0.3641621 B0=3.427126E-7 B1=1.062928E-6 KETA=0.0134667 A1=0.6859506 A2=0.3506788 RDSW=168.5705677
-+ PRWG=0.5 PRWB=-0.4987371 WR=1 WINT=0 LINT=3.028832E-8 XL=0 XW=-1E-8 DWG=-2.349633E-8 DWB=-7.152486E-9
-+ VOFF=-0.0994037 NFACTOR=1.9424315 CIT=0 CDSC=2.4E-4 CDSCD=0 CDSCB=0 ETA0=0.0608072 ETAB=-0.0426148
-+ DSUB=0.7343015 PCLM=3.2579974 PDIBLC1=7.229527E-6 PDIBLC2=0.025389 PDIBLCB=-1E-3 DROUT=0 PSCBE1=1.454878E10
-+ PSCBE2=4.202027E-9 PVAG=15 DELTA=0.01 RSH=7.8 MOBMOD=1 PRT=0 UTE=-1.5 KT1=-0.11 KT1L=0 KT2=0.022 UA1=4.31E-9
-+ UB1=-7.61E-18 UC1=-5.6E-11 AT=3.3E4 WL=0 WLN=1 WW=0 WWN=1 WWL=0 LL=0 LLN=1 LW=0 LWN=1 LWL=0 CAPMOD=2 XPART=0.5
-+ CGDO=6.32E-10 CGSO=6.32E-10 CGBO=1E-12 CJ=1.172138E-3 PB=0.8421173 MJ=0.4109788 CJSW=2.242609E-10 PBSW=0.8 + MJSW=0.3752089 CJSWG=4.22E-10 PBSWG=0.8 MJSWG=0.3752089 CF=0 PVTH0=1.888482E-3 PRDSW=11.5315407 PK2=1.559399E-3
-+ WKETA=0.0319301 LKETA=2.955547E-3 PU0=-1.1105313 PUA=-4.62102E-11 PUB=1E-21 PVSAT=50 PETA0=1E-4 PKETA=-4.346368E-3)
diff --git a/src/deviceModelLibrary/MOS/PMOS-180nm.xml b/src/deviceModelLibrary/MOS/PMOS-180nm.xml
deleted file mode 100644
index 6696752d..00000000
--- a/src/deviceModelLibrary/MOS/PMOS-180nm.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<library>
-<model_name>PMOS</model_name>
-<ref_model>CMOSP</ref_model>
-<param>
-<LEVEL>8 </LEVEL>
-<VERSION>3.2 </VERSION>
-<TNOM>27 </TNOM>
-<TOX>4.1E-9 </TOX>
-<XJ>1E-7 </XJ>
-<NCH>4.1589E17 </NCH>
-<VTH0>-0.3938813 </VTH0>
-<K1>0.5479015</K1>
-<K2>0.0360586 </K2>
-<K3>0.0993095 </K3>
-<K3B>5.7086622</K3B>
-<W0>1E-6 </W0>
-<NLX>1.313191E-7 </NLX>
-<DVT0W>0 </DVT0W>
-<DVT1W>0 </DVT1W>
-<DVT2W>0 </DVT2W>
-<DVT0>0.4911363</DVT0>
-<DVT1>0.2227356</DVT1>
-<DVT2>0.1 </DVT2>
-<U0>115.6852975 </U0>
-<UA>1.505832E-9</UA>
-<UB>1E-21 </UB>
-<UC>-1E-10 </UC>
-<VSAT>1.329694E5 </VSAT>
-<A0>1.7590478 </A0>
-<AGS>0.3641621 </AGS>
-<B0>3.427126E-7 </B0>
-<B1>1.062928E-6 </B1>
-<KETA>0.0134667 </KETA>
-<A1>0.6859506 </A1>
-<A2>0.3506788 </A2>
-<RDSW>168.5705677</RDSW>
-<PRWG>0.5 </PRWG>
-<PRWB>-0.4987371 </PRWB>
-<WR>1 </WR>
-<WINT>0 </WINT>
-<LINT>3.028832E-8 </LINT>
-<XL>0 </XL>
-<XW>-1E-8 </XW>
-<DWG>-2.349633E-8 </DWG>
-<DWB>-7.152486E-9 </DWB>
-<VOFF>-0.0994037 </VOFF>
-<NFACTOR>1.9424315 </NFACTOR>
-<CIT>0 </CIT>
-<CDSC>2.4E-4 </CDSC>
-<CDSCD>0 </CDSCD>
-<CDSCB>0 </CDSCB>
-<ETA0>0.0608072 </ETA0>
-<ETAB>-0.0426148</ETAB>
-<DSUB>0.7343015 </DSUB>
-<PCLM>3.2579974 </PCLM>
-<PDIBLC1>7.229527E-6 </PDIBLC1>
-<PDIBLC2>0.025389 </PDIBLC2>
-<PDIBLCB>-1E-3 </PDIBLCB>
-<DROUT>0 </DROUT>
-<PSCBE1>1.454878E10</PSCBE1>
-<PSCBE2>4.202027E-9 </PSCBE2>
-<PVAG>15 </PVAG>
-<DELTA>0.01 </DELTA>
-<RSH>7.8 </RSH>
-<MOBMOD>1 </MOBMOD>
-<PRT>0 </PRT>
-<UTE>-1.5 </UTE>
-<KT1>-0.11 </KT1>
-<KT1L>0 </KT1L>
-<KT2>0.022 </KT2>
-<UA1>4.31E-9</UA1>
-<UB1>-7.61E-18 </UB1>
-<UC1>-5.6E-11 </UC1>
-<AT>3.3E4 </AT>
-<WL>0 </WL>
-<WLN>1 </WLN>
-<WW>0 </WW>
-<WWN>1 </WWN>
-<WWL>0 </WWL>
-<LL>0 </LL>
-<LLN>1 </LLN>
-<LW>0 </LW>
-<LWN>1 </LWN>
-<LWL>0 </LWL>
-<CAPMOD>2 </CAPMOD>
-<XPART>0.5</XPART>
-<CGDO>6.32E-10 </CGDO>
-<CGSO>6.32E-10 </CGSO>
-<CGBO>1E-12 </CGBO>
-<CJ>1.172138E-3 </CJ>
-<PB>0.8421173 </PB>
-<MJ>0.4109788 </MJ>
-<CJSW>2.242609E-10 </CJSW>
-<PBSW>0.8</PBSW>
-<MJSW>0.3752089 </MJSW>
-<CJSWG>4.22E-10 </CJSWG>
-<PBSWG>0.8 </PBSWG>
-<MJSWG>0.3752089 </MJSWG>
-<CF>0 </CF>
-<PVTH0>1.888482E-3 </PVTH0>
-<PRDSW>11.5315407 </PRDSW>
-<PK2>1.559399E-3 </PK2>
-<WKETA>0.0319301 </WKETA>
-<LKETA>2.955547E-3 </LKETA>
-<PU0>-1.1105313 </PU0>
-<PUA>-4.62102E-11</PUA>
-<PUB>1E-21 </PUB>
-<PVSAT>50 </PVSAT>
-<PETA0>1E-4 </PETA0>
-<PKETA>-4.346368E-3 </PKETA>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/MOS/PMOS-5um.lib b/src/deviceModelLibrary/MOS/PMOS-5um.lib
deleted file mode 100644
index 9c3ed976..00000000
--- a/src/deviceModelLibrary/MOS/PMOS-5um.lib
+++ /dev/null
@@ -1,5 +0,0 @@
-*5um technology
-
-.model mos_p PMOS( Cgso=0.4n Tox=85n Vto=-1 phi=0.65
-+ Level=1
-+ Mj=.5 UO=250 Cgdo=0.4n Gamma=0.65 LAMBDA=0.03 LD=0.6u JS=1u CJ=0.18m CJSW=0.6n MJSW=0.5 PB=0.7 CGBO=0.2n )
diff --git a/src/deviceModelLibrary/MOS/PMOS-5um.xml b/src/deviceModelLibrary/MOS/PMOS-5um.xml
deleted file mode 100644
index f68bada2..00000000
--- a/src/deviceModelLibrary/MOS/PMOS-5um.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<library>
-<model_name>PMOS</model_name>
-<ref_model>mos_p</ref_model>
-<param>
-<Cgso>0.4n </Cgso>
-<Tox>85n </Tox>
-<Vto>-1 </Vto>
-<phi>0.65</phi>
-<Level>1</Level>
-<Mj>.5 </Mj>
-<UO>250 </UO>
-<Cgdo>0.4n </Cgdo>
-<Gamma>0.65 </Gamma>
-<LAMBDA>0.03 </LAMBDA>
-<LD>0.6u </LD>
-<JS>1u </JS>
-<CJ>0.18m </CJ>
-<CJSW>0.6n </CJSW>
-<MJSW>0.5 </MJSW>
-<PB>0.7 </PB>
-<CGBO>0.2n</CGBO>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Misc/CORE.lib b/src/deviceModelLibrary/Misc/CORE.lib
deleted file mode 100644
index a7581029..00000000
--- a/src/deviceModelLibrary/Misc/CORE.lib
+++ /dev/null
@@ -1,9 +0,0 @@
-.MODEL K3019PL_3C8 Core(
-+ A=44.82
-+ C=.4112
-+ abc=123
-+ Area=1.38
-+ K=25.74
-+ MS=415.2K
-+ Path=4.52
-) \ No newline at end of file
diff --git a/src/deviceModelLibrary/Misc/CORE.xml b/src/deviceModelLibrary/Misc/CORE.xml
deleted file mode 100644
index c95d9db0..00000000
--- a/src/deviceModelLibrary/Misc/CORE.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<library>
-<model_name>Core</model_name>
-<ref_model>K3019PL_3C8</ref_model>
-<param><A>44.82 </A><C>.4112</C><abc>123</abc><Area>1.38</Area><K>25.74</K><MS>415.2K</MS><Path>4.52</Path></param></library>
diff --git a/src/deviceModelLibrary/Templates/CORE.lib b/src/deviceModelLibrary/Templates/CORE.lib
deleted file mode 100644
index a7581029..00000000
--- a/src/deviceModelLibrary/Templates/CORE.lib
+++ /dev/null
@@ -1,9 +0,0 @@
-.MODEL K3019PL_3C8 Core(
-+ A=44.82
-+ C=.4112
-+ abc=123
-+ Area=1.38
-+ K=25.74
-+ MS=415.2K
-+ Path=4.52
-) \ No newline at end of file
diff --git a/src/deviceModelLibrary/Templates/CORE.xml b/src/deviceModelLibrary/Templates/CORE.xml
deleted file mode 100644
index c95d9db0..00000000
--- a/src/deviceModelLibrary/Templates/CORE.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<library>
-<model_name>Core</model_name>
-<ref_model>K3019PL_3C8</ref_model>
-<param><A>44.82 </A><C>.4112</C><abc>123</abc><Area>1.38</Area><K>25.74</K><MS>415.2K</MS><Path>4.52</Path></param></library>
diff --git a/src/deviceModelLibrary/Templates/D.lib b/src/deviceModelLibrary/Templates/D.lib
deleted file mode 100644
index 8a7fb4da..00000000
--- a/src/deviceModelLibrary/Templates/D.lib
+++ /dev/null
@@ -1,2 +0,0 @@
-.model 1n4148 D(is=2.495E-09 rs=4.755E-01 n=1.679E+00 tt=3.030E-09 cjo=1.700E-12 vj=1 m=1.959E-01 bv=1.000E+02 ibv=1.000E-04)
-
diff --git a/src/deviceModelLibrary/Templates/D.xml b/src/deviceModelLibrary/Templates/D.xml
deleted file mode 100644
index 8b6b14c8..00000000
--- a/src/deviceModelLibrary/Templates/D.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<library>
-<model_name>D</model_name>
-<ref_model>1N4148</ref_model>
-<param>
- <Is>2.495E-09</Is>
- <Rs>4.755E-01</Rs>
- <N>1.679E+00</N>
- <tt>3.030E-09</tt>
- <Cjo>1.700E-12</Cjo>
- <M>1.959E-01</M>
- <Vj>1</Vj>
- <Bv>1.000E+02</Bv>
- <Ibv>1.000E-04</Ibv>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Templates/NIGBT.lib b/src/deviceModelLibrary/Templates/NIGBT.lib
deleted file mode 100644
index 8c09dcbc..00000000
--- a/src/deviceModelLibrary/Templates/NIGBT.lib
+++ /dev/null
@@ -1,10 +0,0 @@
-.MODEL IXGH40N60 NIGBT (
-+ TAU=287.56E-9
-+ KP=50.034
-+ AREA=37.500E-6
-+ AGD=18.750E-6
-+ VT=4.1822
-+ KF=.36047
-+ CGS=31.942E-9
-+ COXD=53.188E-9
-+ VTD=2.6570)
diff --git a/src/deviceModelLibrary/Templates/NIGBT.xml b/src/deviceModelLibrary/Templates/NIGBT.xml
deleted file mode 100644
index 97f33196..00000000
--- a/src/deviceModelLibrary/Templates/NIGBT.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<library>
-<model_name>NIGBT</model_name>
-<ref_model>IXGH40N60</ref_model>
-<param>
-<TAU>287.56E-9</TAU>
-<KP>50.034</KP>
-<AREA>37.500E-6</AREA>
-<AGD>18.750E-6</AGD>
-<VT>4.1822</VT>
-<KF>.36047</KF>
-<CGS>31.942E-9</CGS>
-<COXD>53.188E-9</COXD>
-<VTD>2.6570</VTD>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Templates/NJF.lib b/src/deviceModelLibrary/Templates/NJF.lib
deleted file mode 100644
index dbb2cbae..00000000
--- a/src/deviceModelLibrary/Templates/NJF.lib
+++ /dev/null
@@ -1,4 +0,0 @@
-.model J2N3819 NJF(Beta=1.304m Betatce=-.5 Rd=1 Rs=1 Lambda=2.25m Vto=-3
-+ Vtotc=-2.5m Is=33.57f Isr=322.4f N=1 Nr=2 Xti=3 Alpha=311.7u
-+ Vk=243.6 Cgd=1.6p M=.3622 Pb=1 Fc=.5 Cgs=2.414p Kf=9.882E-18
-+ Af=1)
diff --git a/src/deviceModelLibrary/Templates/NJF.xml b/src/deviceModelLibrary/Templates/NJF.xml
deleted file mode 100644
index 94753691..00000000
--- a/src/deviceModelLibrary/Templates/NJF.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<library>
-<model_name>NJF</model_name>
-<ref_model>J2N3819</ref_model>
-<param>
-<Beta>1.304m</Beta>
-<Betatce>-.5</Betatce>
-<Rd>1 </Rd>
-<Rs>1 </Rs>
-<Lambda>2.25m</Lambda>
-<Vto>-3</Vto>
-<Vtotc>-2.5m</Vtotc>
-<Is>33.57f </Is>
-<Isr>322.4f </Isr>
-<N>1</N>
-<Nr>2</Nr>
-<Xti>3</Xti>
-<Alpha>311.7u</Alpha>
-<Vk>243.6 </Vk>
-<Cgd>1.6p </Cgd>
-<M>.3622 </M>
-<Pb>1</Pb>
-<Fc>.5</Fc>
-<Cgs>2.414p</Cgs>
-<Kf>9.882E-18</Kf>
-<Af>1</Af>
-
-
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Templates/NMOS-0.5um.lib b/src/deviceModelLibrary/Templates/NMOS-0.5um.lib
deleted file mode 100644
index 2e6f4635..00000000
--- a/src/deviceModelLibrary/Templates/NMOS-0.5um.lib
+++ /dev/null
@@ -1,6 +0,0 @@
-.model mos_n NMOS( TPG=1 TOX=9.5n CJ=550u ETA=0.02125 VMAX=1.8E05
-+ GAMMA=0.62 CGSO=0.3n LD=50n MJSW=0.35 PB=1.1
-+ CGBO=0.45n XJ=0.2U CGDO=0.3n KAPPA=0.1 LEVEL=3
-+ VTO=0.6 NFS=7.20E11 THETA=0.23 CJSW=0.3n PHI=0.7
-+ RSH=2.0 MJ=0.6 UO=420 KP=156u DELTA=0.88
-+ NSUB=1.40E17 ) \ No newline at end of file
diff --git a/src/deviceModelLibrary/Templates/NMOS-0.5um.xml b/src/deviceModelLibrary/Templates/NMOS-0.5um.xml
deleted file mode 100644
index 08fdf0e3..00000000
--- a/src/deviceModelLibrary/Templates/NMOS-0.5um.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<library>
-<model_name>NMOS</model_name>
-<ref_model>mos_n</ref_model>
-<param>
-<TPG>1</TPG>
-<TOX>9.5n </TOX>
-<CJ>550u </CJ>
-<ETA>0.02125 </ETA>
-<VMAX>1.8E05</VMAX>
-<GAMMA>0.62</GAMMA>
-<CGSO>0.3n </CGSO>
-<LD>50n </LD>
-<MJSW>0.35 </MJSW>
-<PB>1.1</PB>
-<CGBO>0.45n </CGBO>
-<XJ>0.2U </XJ>
-<CGDO>0.3n </CGDO>
-<KAPPA>0.1 </KAPPA>
-<LEVEL>3 </LEVEL>
-<VTO>0.6 </VTO>
-<NFS>7.20E11 </NFS>
-<THETA>0.23 </THETA>
-<CJSW>0.3n </CJSW>
-<PHI>0.7 </PHI>
-<RSH>2.0 </RSH>
-<MJ>0.6 </MJ>
-<UO>420</UO>
-<KP>156u </KP>
-<DELTA>0.88</DELTA>
-<NSUB>1.40E17</NSUB>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Templates/NMOS-180nm.lib b/src/deviceModelLibrary/Templates/NMOS-180nm.lib
deleted file mode 100644
index 51e9b119..00000000
--- a/src/deviceModelLibrary/Templates/NMOS-180nm.lib
+++ /dev/null
@@ -1,13 +0,0 @@
-.model CMOSN NMOS (LEVEL=8 VERSION=3.2 TNOM=27 TOX=4.1E-9 XJ=1E-7 NCH=2.3549E17 VTH0=0.3823463 K1=0.5810697
-+ K2=4.774618E-3 K3=0.0431669 K3B=1.1498346 W0=1E-7 NLX=1.910552E-7 DVT0W=0 DVT1W=0 DVT2W=0
-+ DVT0=1.2894824 DVT1=0.3622063 DVT2=0.0713729 U0=280.633249 UA=-1.208537E-9 UB=2.158625E-18
-+ UC=5.342807E-11 VSAT=9.366802E4 A0=1.7593146 AGS=0.3939741 B0=-6.413949E-9 B1=-1E-7 KETA=-5.180424E-4
-+ A1=0 A2=1 RDSW=105.5517558 PRWG=0.5 PRWB=-0.1998871 WR=1 WINT=7.904732E-10 LINT=1.571424E-8 XL=0
-+ XW=-1E-8 DWG=1.297221E-9 DWB=1.479041E-9 VOFF=-0.0955434 NFACTOR=2.4358891 CIT=0 CDSC=2.4E-4 CDSCD=0
-+ CDSCB=0 ETA0=3.104851E-3 ETAB=-2.512384E-5 DSUB=0.0167075 PCLM=0.8073191 PDIBLC1=0.1666161 PDIBLC2=3.112892E-3
-+ PDIBLCB=-0.1 DROUT=0.7875618 PSCBE1=8E10 PSCBE2=9.213635E-10 PVAG=3.85243E-3 DELTA=0.01 RSH=6.7 MOBMOD=1
-+ PRT=0 UTE=-1.5 KT1=-0.11 KT1L=0 KT2=0.022 UA1=4.31E-9 UB1=-7.61E-18 UC1=-5.6E-11 AT=3.3E4 WL=0 WLN=1
-+ WW=0 WWN=1 WWL=0 LL=0 LLN=1 LW=0 LWN=1 LWL=0 CAPMOD=2 XPART=0.5 CGDO=7.08E-10 CGSO=7.08E-10 CGBO=1E-12
-+ CJ=9.68858E-4 PB=0.8 MJ=0.3864502 CJSW=2.512138E-10 PBSW=0.809286 MJSW=0.1060414 CJSWG=3.3E-10 PBSWG=0.809286
-+ MJSWG=0.1060414 CF=0 PVTH0=-1.192722E-3 PRDSW=-5 PK2=6.450505E-5 WKETA=-4.27294E-4 LKETA=-0.0104078
-+ PU0=6.3268729 PUA=2.226552E-11 PUB=0 PVSAT=969.1480157 PETA0=1E-4 PKETA=-1.049509E-3)
diff --git a/src/deviceModelLibrary/Templates/NMOS-180nm.xml b/src/deviceModelLibrary/Templates/NMOS-180nm.xml
deleted file mode 100644
index d0249bb6..00000000
--- a/src/deviceModelLibrary/Templates/NMOS-180nm.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<library>
-<model_name>NMOS</model_name>
-<ref_model>CMOSN</ref_model>
-<param>
-<LEVEL>8 </LEVEL>
-<VERSION>3.2 </VERSION>
-<TNOM>27 </TNOM>
-<TOX>4.1E-9 </TOX>
-<XJ>1E-7 </XJ>
-<NCH>2.3549E17 </NCH>
-<VTH0>0.3823463 </VTH0>
-<K1>0.5810697 </K1>
-<K2>4.774618E-3 </K2>
-<K3>0.0431669 </K3>
-<K3B>1.1498346</K3B>
-<W0>1E-7 </W0>
-<NLX>1.910552E-7 </NLX>
-<DVT0W>0 </DVT0W>
-<DVT1W>0 </DVT1W>
-<DVT2W>0 </DVT2W>
-<DVT0>1.2894824 </DVT0>
-<DVT1>0.3622063 </DVT1>
-<DVT2>0.0713729 </DVT2>
-<U0>280.633249 </U0>
-<UA>-1.208537E-9 </UA>
-<UB>2.158625E-18</UB>
-<UC>5.342807E-11 </UC>
-<VSAT>9.366802E4</VSAT>
-<A0>1.7593146 </A0>
-<AGS>0.3939741 </AGS>
-<B0>-6.413949E-9 </B0>
-<B1>-1E-7 </B1>
-<KETA>-5.180424E-4</KETA>
-<A1>0 </A1>
-<A2>1 </A2>
-<RDSW>105.5517558</RDSW>
-<PRWG>0.5 </PRWG>
-<PRWB>-0.1998871 </PRWB>
-<WR>1 </WR>
-<WINT>7.904732E-10 </WINT>
-<LINT>1.571424E-8 </LINT>
-<XL>0</XL>
-<XW>-1E-8 </XW>
-<DWG>1.297221E-9 </DWG>
-<DWB>1.479041E-9</DWB>
-<VOFF>-0.0955434 </VOFF>
-<NFACTOR>2.4358891 </NFACTOR>
-<CIT>0 </CIT>
-<CDSC>2.4E-4 </CDSC>
-<CDSCD>0</CDSCD>
-<CDSCB>0 </CDSCB>
-<ETA0>=3.104851E-3 </ETA0>
-<ETAB>-2.512384E-5 </ETAB>
-<DSUB>0.0167075 </DSUB>
-<PCLM>0.8073191 </PCLM>
-<PDIBLC1>0.1666161 </PDIBLC1>
-<PDIBLC2>3.112892E-3 </PDIBLC2>
-<PDIBLCB>-0.1 </PDIBLCB>
-<DROUT>0.7875618 </DROUT>
-<PSCBE1>8E10 </PSCBE1>
-<PSCBE2>9.213635E-10 </PSCBE2>
-<PVAG>3.85243E-3 </PVAG>
-<DELTA>0.01 </DELTA>
-<RSH>6.7 </RSH>
-<MOBMOD>1</MOBMOD>
-<PRT>0 </PRT>
-<UTE>-1.5 </UTE>
-<KT1>-0.11 </KT1>
-<KT1L>0 </KT1L>
-<KT2>0.022 </KT2>
-<UA1>4.31E-9 </UA1>
-<UB1>-7.61E-18 </UB1>
-<UC1>-5.6E-11 </UC1>
-<AT>3.3E4 </AT>
-<WL>0 </WL>
-<WLN>1</WLN>
-<WW>0 </WW>
-<WWN>1 </WWN>
-<WWL>0 </WWL>
-<LL>0 </LL>
-<LLN>1 </LLN>
-<LW>0 </LW>
-<LWN>1 </LWN>
-<LWL>0 </LWL>
-<CAPMOD>2 </CAPMOD>
-<XPART>0.5 </XPART>
-<CGDO>7.08E-10 </CGDO>
-<CGSO>7.08E-10 </CGSO>/
-<CGBO>1E-12</CGBO>
-<CJ>9.68858E-4 </CJ>
-<PB>0.8 </PB>
-<MJ>0.3864502 </MJ>
-<CJSW>2.512138E-10 </CJSW>
-<PBSW>0.809286 </PBSW>
-<MJSW>0.1060414 </MJSW>
-<CJSWG>3.3E-10 </CJSWG>
-<PBSWG>0.809286 </PBSWG>
-<MJSWG>0.1060414 </MJSWG>
-<CF>0 </CF>
-<PVTH0>-1.192722E-3 </PVTH0>
-<PRDSW>-5 </PRDSW>
-<PK2>6.450505E-5 </PK2>
-<WKETA>-4.27294E-4 </WKETA>
-<LKETA>-0.0104078 </LKETA>
-<PU0>6.3268729 </PU0>
-<PUA>2.226552E-11 </PUA>
-<PUB>0 </PUB>
-<PVSAT>969.1480157</PVSAT>
-<PETA0>1E-4 </PETA0>
-<PKETA>-1.049509E-3</PKETA>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Templates/NMOS-5um.lib b/src/deviceModelLibrary/Templates/NMOS-5um.lib
deleted file mode 100644
index a237e1fe..00000000
--- a/src/deviceModelLibrary/Templates/NMOS-5um.lib
+++ /dev/null
@@ -1,5 +0,0 @@
-* 5um technology
-
-.model mos_n NMOS( Cgso=0.4n Tox=85n Vto=1 phi=0.7
-+ Level=1
-+ Mj=.5 UO=750 Cgdo=0.4n Gamma=1.4 LAMBDA=0.01 LD=0.7u JS=1u CJ=0.4m CJSW=0.8n MJSW=0.5 PB=0.7 CGBO=0.2n )
diff --git a/src/deviceModelLibrary/Templates/NMOS-5um.xml b/src/deviceModelLibrary/Templates/NMOS-5um.xml
deleted file mode 100644
index 358fbdbe..00000000
--- a/src/deviceModelLibrary/Templates/NMOS-5um.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<library>
-<model_name>NMOS</model_name>
-<ref_model>mos_n</ref_model>
-<param>
-<Cgso>0.4n</Cgso>
-<Tox>85n</Tox>
-<Vto>1</Vto>
-<phi>0.7</phi>
-<Level>1</Level>
-<Mj>.5</Mj>
-<UO>750</UO>
-<Cgdo>0.4n</Cgdo>
-<Gamma>1.4</Gamma>
-<LAMBDA>0.01 </LAMBDA>
-<LD>0.7u </LD>
-<JS>1u </JS>
-<CJ>0.4m</CJ>
-<CJSW>0.8n</CJSW>
-<MJSW>0.5 </MJSW>
-<PB>0.7</PB>
-<CGBO>0.2n</CGBO>
-
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Templates/NPN.lib b/src/deviceModelLibrary/Templates/NPN.lib
deleted file mode 100644
index 6509fe7a..00000000
--- a/src/deviceModelLibrary/Templates/NPN.lib
+++ /dev/null
@@ -1,4 +0,0 @@
-.model Q2N2222 NPN( Is=14.34f Xti=3 Eg=1.11 Vaf=74.03 Bf=400 Ne=1.307
-+ Ise=14.34f Ikf=.2847 Xtb=1.5 Br=6.092 Nc=2 Isc=0 Ikr=0 Rc=1 Cjc=7.306p
-+ Mjc=.3416 Vjc=.75 Fc=.5 Cje=22.01p Mje=.377 Vje=.75 Tr=46.91n Tf=411.1p
-+ Itf=.6 Vtf=1.7 Xtf=3 Rb=10)
diff --git a/src/deviceModelLibrary/Templates/NPN.xml b/src/deviceModelLibrary/Templates/NPN.xml
deleted file mode 100644
index b2698bb1..00000000
--- a/src/deviceModelLibrary/Templates/NPN.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<library>
-<model_name>NPN</model_name>
-<ref_model>Q2N2222</ref_model>
-<param>
-<Is>14.34f </Is>
-<Xti>3 </Xti>
-<Eg>1.11 </Eg>
-<Vaf>74.03 </Vaf>
-<Bf>400 </Bf>
-<Ne>1.307 </Ne>
-<Ise>14.34f </Ise>
-<Ikf>.2847 </Ikf>
-<Xtb>1.5 </Xtb>
-<Br>6.092 </Br>
-<Nc>2 </Nc>
-<Isc>0 </Isc>
-<Ikr>0 </Ikr>
-<Rc>1 </Rc>
-<Cjc>7.306p </Cjc>
-<Mjc>.3416 </Mjc>
-<Vjc>.75 </Vjc>
-<Fc>.5 </Fc>
-<Cje>22.01p </Cje>
-<Mje>.377 </Mje>
-<Vje>.75 </Vje>
-<Tr>46.91n </Tr>
-<Tf>411.1p </Tf>
-<Itf>.6 </Itf>
-<Vtf>1.7 </Vtf>
-<Xtf>3 </Xtf>
-<Rb>10 </Rb>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Templates/PIGBT.lib b/src/deviceModelLibrary/Templates/PIGBT.lib
deleted file mode 100644
index d4f9e814..00000000
--- a/src/deviceModelLibrary/Templates/PIGBT.lib
+++ /dev/null
@@ -1,10 +0,0 @@
-.MODEL IXGH40N60 PIGBT (
-+ TAU=287.56E-9
-+ KP=50.034
-+ AREA=37.500E-6
-+ AGD=18.750E-6
-+ VT=4.1822
-+ KF=.36047
-+ CGS=31.942E-9
-+ COXD=53.188E-9
-+ VTD=2.6570)
diff --git a/src/deviceModelLibrary/Templates/PIGBT.xml b/src/deviceModelLibrary/Templates/PIGBT.xml
deleted file mode 100644
index 1e57f2e3..00000000
--- a/src/deviceModelLibrary/Templates/PIGBT.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<library>
-<model_name>PIGBT</model_name>
-<ref_model>IXGH40N60</ref_model>
-<param>
-<TAU>287.56E-9</TAU>
-<KP>50.034</KP>
-<AREA>37.500E-6</AREA>
-<AGD>18.750E-6</AGD>
-<VT>4.1822</VT>
-<KF>.36047</KF>
-<CGS>31.942E-9</CGS>
-<COXD>53.188E-9</COXD>
-<VTD>2.6570 </VTD>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Templates/PJF.lib b/src/deviceModelLibrary/Templates/PJF.lib
deleted file mode 100644
index 5589571d..00000000
--- a/src/deviceModelLibrary/Templates/PJF.lib
+++ /dev/null
@@ -1,5 +0,0 @@
-.model J2N3820 PJF(Beta=1.304m Betatce=-.5 Rd=1 Rs=1 Lambda=2.25m Vto=-3
-+ Vtotc=-2.5m Is=33.57f Isr=322.4f N=1 Nr=2 Xti=3 Alpha=311.7u
-+ Vk=243.6 Cgd=1.6p M=.3622 Pb=1 Fc=.5 Cgs=2.414p Kf=9.882E-18
-+ Af=1)
-
diff --git a/src/deviceModelLibrary/Templates/PJF.xml b/src/deviceModelLibrary/Templates/PJF.xml
deleted file mode 100644
index f682f8cb..00000000
--- a/src/deviceModelLibrary/Templates/PJF.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<library>
-<model_name>PJF</model_name>
-<ref_model>J2N3820</ref_model>
-<param>
-<Beta>1.304m </Beta>
-<Betatce>-.5</Betatce>
-<Rd>1 </Rd>
-<Rs>1 </Rs>
-<Lambda>2.25m</Lambda>
-<Vto>-3</Vto>
-<Vtotc>-2.5m </Vtotc>
-<Is>33.57f </Is>
-<Isr>322.4f</Isr>
-<N>1 </N>
-<Nr>2 </Nr>
-<Xti>3 </Xti>
-<Alpha>311.7u</Alpha>
-<Vk>243.6 </Vk>
-<Cgd>1.6p </Cgd>
-<M>.3622 </M>
-<Pb>1 </Pb>
-<Fc>.5 </Fc>
-<Cgs>2.414p </Cgs>
-<Kf>9.882E-18</Kf>
-<Af>1</Af>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Templates/PMOS-0.5um.lib b/src/deviceModelLibrary/Templates/PMOS-0.5um.lib
deleted file mode 100644
index 848e8b05..00000000
--- a/src/deviceModelLibrary/Templates/PMOS-0.5um.lib
+++ /dev/null
@@ -1,6 +0,0 @@
-.model mos_p PMOS( TPG=-1 TOX=9.5n CJ=950u ETA=0.025 VMAX=0.3u
-+ GAMMA=0.52 CGSO=0.35n LD=70n MJSW=0.25 PB=1
-+ CGBO=0.45n XJ=0.2U CGDO=0.35n KAPPA=8.0 LEVEL=3
-+ VTO=-0.6 NFS=6.50E11 THETA=0.2 CJSW=0.2n PHI=0.7
-+ RSH=2.5 MJ=0.5 UO=130 KP=48u DELTA=0.25
-+ NSUB=1.0E17 ) \ No newline at end of file
diff --git a/src/deviceModelLibrary/Templates/PMOS-0.5um.xml b/src/deviceModelLibrary/Templates/PMOS-0.5um.xml
deleted file mode 100644
index 013d461c..00000000
--- a/src/deviceModelLibrary/Templates/PMOS-0.5um.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<library>
-<model_name>PMOS</model_name>
-<ref_model>mos_p</ref_model>
-<param>
-<TPG>-1 </TPG>
-<TOX>9.5n </TOX>
-<CJ>950u </CJ>
-<ETA>0.025 </ETA>
-<VMAX>0.3u </VMAX>
-<GAMMA>0.52 </GAMMA>
-<CGSO>0.35n </CGSO>
-<LD>70n </LD>
-<MJSW>0.25 </MJSW>
-<PB>1 </PB>
-<CGBO>0.45n </CGBO>
-<XJ>0.2U </XJ>
-<CGDO>0.35n </CGDO>
-<KAPPA>8.0 </KAPPA>
-<LEVEL>3 </LEVEL>
-<VTO>-0.6 </VTO>
-<NFS>6.50E11 </NFS>
-<THETA>0.2 </THETA>
-<CJSW>0.2n </CJSW>
-<PHI>0.7 </PHI>
-<RSH>2.5 </RSH>
-<MJ>0.5</MJ>
-<UO>130 </UO>
-<KP>48u </KP>
-<DELTA>0.25 </DELTA>
-<NSUB>1.0E17</NSUB>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Templates/PMOS-180nm.lib b/src/deviceModelLibrary/Templates/PMOS-180nm.lib
deleted file mode 100644
index 032b5b95..00000000
--- a/src/deviceModelLibrary/Templates/PMOS-180nm.lib
+++ /dev/null
@@ -1,11 +0,0 @@
-.model CMOSP PMOS (LEVEL=8 VERSION=3.2 TNOM=27 TOX=4.1E-9 XJ=1E-7 NCH=4.1589E17 VTH0=-0.3938813 K1=0.5479015
-+ K2=0.0360586 K3=0.0993095 K3B=5.7086622 W0=1E-6 NLX=1.313191E-7 DVT0W=0 DVT1W=0 DVT2W=0 DVT0=0.4911363
-+ DVT1=0.2227356 DVT2=0.1 U0=115.6852975 UA=1.505832E-9 UB=1E-21 UC=-1E-10 VSAT=1.329694E5 A0=1.7590478
-+ AGS=0.3641621 B0=3.427126E-7 B1=1.062928E-6 KETA=0.0134667 A1=0.6859506 A2=0.3506788 RDSW=168.5705677
-+ PRWG=0.5 PRWB=-0.4987371 WR=1 WINT=0 LINT=3.028832E-8 XL=0 XW=-1E-8 DWG=-2.349633E-8 DWB=-7.152486E-9
-+ VOFF=-0.0994037 NFACTOR=1.9424315 CIT=0 CDSC=2.4E-4 CDSCD=0 CDSCB=0 ETA0=0.0608072 ETAB=-0.0426148
-+ DSUB=0.7343015 PCLM=3.2579974 PDIBLC1=7.229527E-6 PDIBLC2=0.025389 PDIBLCB=-1E-3 DROUT=0 PSCBE1=1.454878E10
-+ PSCBE2=4.202027E-9 PVAG=15 DELTA=0.01 RSH=7.8 MOBMOD=1 PRT=0 UTE=-1.5 KT1=-0.11 KT1L=0 KT2=0.022 UA1=4.31E-9
-+ UB1=-7.61E-18 UC1=-5.6E-11 AT=3.3E4 WL=0 WLN=1 WW=0 WWN=1 WWL=0 LL=0 LLN=1 LW=0 LWN=1 LWL=0 CAPMOD=2 XPART=0.5
-+ CGDO=6.32E-10 CGSO=6.32E-10 CGBO=1E-12 CJ=1.172138E-3 PB=0.8421173 MJ=0.4109788 CJSW=2.242609E-10 PBSW=0.8 + MJSW=0.3752089 CJSWG=4.22E-10 PBSWG=0.8 MJSWG=0.3752089 CF=0 PVTH0=1.888482E-3 PRDSW=11.5315407 PK2=1.559399E-3
-+ WKETA=0.0319301 LKETA=2.955547E-3 PU0=-1.1105313 PUA=-4.62102E-11 PUB=1E-21 PVSAT=50 PETA0=1E-4 PKETA=-4.346368E-3)
diff --git a/src/deviceModelLibrary/Templates/PMOS-180nm.xml b/src/deviceModelLibrary/Templates/PMOS-180nm.xml
deleted file mode 100644
index 6696752d..00000000
--- a/src/deviceModelLibrary/Templates/PMOS-180nm.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<library>
-<model_name>PMOS</model_name>
-<ref_model>CMOSP</ref_model>
-<param>
-<LEVEL>8 </LEVEL>
-<VERSION>3.2 </VERSION>
-<TNOM>27 </TNOM>
-<TOX>4.1E-9 </TOX>
-<XJ>1E-7 </XJ>
-<NCH>4.1589E17 </NCH>
-<VTH0>-0.3938813 </VTH0>
-<K1>0.5479015</K1>
-<K2>0.0360586 </K2>
-<K3>0.0993095 </K3>
-<K3B>5.7086622</K3B>
-<W0>1E-6 </W0>
-<NLX>1.313191E-7 </NLX>
-<DVT0W>0 </DVT0W>
-<DVT1W>0 </DVT1W>
-<DVT2W>0 </DVT2W>
-<DVT0>0.4911363</DVT0>
-<DVT1>0.2227356</DVT1>
-<DVT2>0.1 </DVT2>
-<U0>115.6852975 </U0>
-<UA>1.505832E-9</UA>
-<UB>1E-21 </UB>
-<UC>-1E-10 </UC>
-<VSAT>1.329694E5 </VSAT>
-<A0>1.7590478 </A0>
-<AGS>0.3641621 </AGS>
-<B0>3.427126E-7 </B0>
-<B1>1.062928E-6 </B1>
-<KETA>0.0134667 </KETA>
-<A1>0.6859506 </A1>
-<A2>0.3506788 </A2>
-<RDSW>168.5705677</RDSW>
-<PRWG>0.5 </PRWG>
-<PRWB>-0.4987371 </PRWB>
-<WR>1 </WR>
-<WINT>0 </WINT>
-<LINT>3.028832E-8 </LINT>
-<XL>0 </XL>
-<XW>-1E-8 </XW>
-<DWG>-2.349633E-8 </DWG>
-<DWB>-7.152486E-9 </DWB>
-<VOFF>-0.0994037 </VOFF>
-<NFACTOR>1.9424315 </NFACTOR>
-<CIT>0 </CIT>
-<CDSC>2.4E-4 </CDSC>
-<CDSCD>0 </CDSCD>
-<CDSCB>0 </CDSCB>
-<ETA0>0.0608072 </ETA0>
-<ETAB>-0.0426148</ETAB>
-<DSUB>0.7343015 </DSUB>
-<PCLM>3.2579974 </PCLM>
-<PDIBLC1>7.229527E-6 </PDIBLC1>
-<PDIBLC2>0.025389 </PDIBLC2>
-<PDIBLCB>-1E-3 </PDIBLCB>
-<DROUT>0 </DROUT>
-<PSCBE1>1.454878E10</PSCBE1>
-<PSCBE2>4.202027E-9 </PSCBE2>
-<PVAG>15 </PVAG>
-<DELTA>0.01 </DELTA>
-<RSH>7.8 </RSH>
-<MOBMOD>1 </MOBMOD>
-<PRT>0 </PRT>
-<UTE>-1.5 </UTE>
-<KT1>-0.11 </KT1>
-<KT1L>0 </KT1L>
-<KT2>0.022 </KT2>
-<UA1>4.31E-9</UA1>
-<UB1>-7.61E-18 </UB1>
-<UC1>-5.6E-11 </UC1>
-<AT>3.3E4 </AT>
-<WL>0 </WL>
-<WLN>1 </WLN>
-<WW>0 </WW>
-<WWN>1 </WWN>
-<WWL>0 </WWL>
-<LL>0 </LL>
-<LLN>1 </LLN>
-<LW>0 </LW>
-<LWN>1 </LWN>
-<LWL>0 </LWL>
-<CAPMOD>2 </CAPMOD>
-<XPART>0.5</XPART>
-<CGDO>6.32E-10 </CGDO>
-<CGSO>6.32E-10 </CGSO>
-<CGBO>1E-12 </CGBO>
-<CJ>1.172138E-3 </CJ>
-<PB>0.8421173 </PB>
-<MJ>0.4109788 </MJ>
-<CJSW>2.242609E-10 </CJSW>
-<PBSW>0.8</PBSW>
-<MJSW>0.3752089 </MJSW>
-<CJSWG>4.22E-10 </CJSWG>
-<PBSWG>0.8 </PBSWG>
-<MJSWG>0.3752089 </MJSWG>
-<CF>0 </CF>
-<PVTH0>1.888482E-3 </PVTH0>
-<PRDSW>11.5315407 </PRDSW>
-<PK2>1.559399E-3 </PK2>
-<WKETA>0.0319301 </WKETA>
-<LKETA>2.955547E-3 </LKETA>
-<PU0>-1.1105313 </PU0>
-<PUA>-4.62102E-11</PUA>
-<PUB>1E-21 </PUB>
-<PVSAT>50 </PVSAT>
-<PETA0>1E-4 </PETA0>
-<PKETA>-4.346368E-3 </PKETA>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Templates/PMOS-5um.lib b/src/deviceModelLibrary/Templates/PMOS-5um.lib
deleted file mode 100644
index 9c3ed976..00000000
--- a/src/deviceModelLibrary/Templates/PMOS-5um.lib
+++ /dev/null
@@ -1,5 +0,0 @@
-*5um technology
-
-.model mos_p PMOS( Cgso=0.4n Tox=85n Vto=-1 phi=0.65
-+ Level=1
-+ Mj=.5 UO=250 Cgdo=0.4n Gamma=0.65 LAMBDA=0.03 LD=0.6u JS=1u CJ=0.18m CJSW=0.6n MJSW=0.5 PB=0.7 CGBO=0.2n )
diff --git a/src/deviceModelLibrary/Templates/PMOS-5um.xml b/src/deviceModelLibrary/Templates/PMOS-5um.xml
deleted file mode 100644
index f68bada2..00000000
--- a/src/deviceModelLibrary/Templates/PMOS-5um.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<library>
-<model_name>PMOS</model_name>
-<ref_model>mos_p</ref_model>
-<param>
-<Cgso>0.4n </Cgso>
-<Tox>85n </Tox>
-<Vto>-1 </Vto>
-<phi>0.65</phi>
-<Level>1</Level>
-<Mj>.5 </Mj>
-<UO>250 </UO>
-<Cgdo>0.4n </Cgdo>
-<Gamma>0.65 </Gamma>
-<LAMBDA>0.03 </LAMBDA>
-<LD>0.6u </LD>
-<JS>1u </JS>
-<CJ>0.18m </CJ>
-<CJSW>0.6n </CJSW>
-<MJSW>0.5 </MJSW>
-<PB>0.7 </PB>
-<CGBO>0.2n</CGBO>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Templates/PNP.lib b/src/deviceModelLibrary/Templates/PNP.lib
deleted file mode 100644
index 7edda0ea..00000000
--- a/src/deviceModelLibrary/Templates/PNP.lib
+++ /dev/null
@@ -1,4 +0,0 @@
-.model Q2N2907A PNP(Is=650.6E-18 Xti=3 Eg=1.11 Vaf=115.7 Bf=231.7 Ne=1.829
-+ Ise=54.81f Ikf=1.079 Xtb=1.5 Br=3.563 Nc=2 Isc=0 Ikr=0 Rc=.715
-+ Cjc=14.76p Mjc=.5383 Vjc=.75 Fc=.5 Cje=19.82p Mje=.3357 Vje=.75
-+ Tr=111.3n Tf=603.7p Itf=.65 Vtf=5 Xtf=1.7 Rb=10)
diff --git a/src/deviceModelLibrary/Templates/PNP.xml b/src/deviceModelLibrary/Templates/PNP.xml
deleted file mode 100644
index 681b3fd9..00000000
--- a/src/deviceModelLibrary/Templates/PNP.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<library>
-<model_name>PNP</model_name>
-<ref_model>Q2N2907A</ref_model>
-<param>
-<Is>650.6E-18</Is>
-<Xti>3 </Xti>
-<Eg>1.11 </Eg>
-<Vaf>115.7 </Vaf>
-<Bf>231.7 </Bf>
-<Ne>1.829</Ne>
-<Ise>54.81f </Ise>
-<Ikf>1.079 </Ikf>
-<Xtb>1.5 </Xtb>
-<Br>3.563 </Br>
-<Nc>2 </Nc>
-<Isc>0 </Isc>
-<Ikr>0</Ikr>
-<Rc>.715</Rc>
-<Cjc>14.76p </Cjc>
-<Mjc>.5383 </Mjc>
-<Vjc>.75 </Vjc>
-<Fc>.5 </Fc>
-<Cje>19.82p </Cje>
-<Mje>.3357 </Mje>
-<Vje>.75</Vje>
-<Tr>111.3n </Tr>
-<Tf>603.7p </Tf>
-<Itf>.65 </Itf>
-<Vtf>5 </Vtf>
-<Xtf>1.7 </Xtf>
-<Rb>10</Rb>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/Transistor/BC547B.lib b/src/deviceModelLibrary/Transistor/BC547B.lib
deleted file mode 100644
index 723537a7..00000000
--- a/src/deviceModelLibrary/Transistor/BC547B.lib
+++ /dev/null
@@ -1 +0,0 @@
-.model BC547B NPN(IS=1.8E-14 BF=400 NF=0.9955 VAF=80 IKF=0.14 ISE=5E-14 NE=1.46 BR=35.5 NR=1.005 VAR=12.5 IKR=0.03 ISC=1.72E-13 NC=1.27 RB=0.56 RE=0.6 RC=0.25 CJE=1.3E-11 TF=6.4E-10 CJC=4E-12 VJC=0.54 TR=5.072E-8)
diff --git a/src/deviceModelLibrary/Transistor/BC547B.xml b/src/deviceModelLibrary/Transistor/BC547B.xml
deleted file mode 100644
index da06e5c4..00000000
--- a/src/deviceModelLibrary/Transistor/BC547B.xml
+++ /dev/null
@@ -1 +0,0 @@
-<library><model_name>NPN</model_name><ref_model>BC547B</ref_model><param><Vtf>1.7 </Vtf><Cjc>7.306p </Cjc><Nc>2 </Nc><Tr>46.91n </Tr><Ne>1.307 </Ne><Cje>22.01p </Cje><Isc>0 </Isc><Xtb>1.5 </Xtb><Rb>10 </Rb><Rc>1 </Rc><Tf>411.1p </Tf><Xti>3 </Xti><Ikr>0 </Ikr><Bf>400 </Bf><Fc>.5 </Fc><Ise>14.34f </Ise><Br>6.092 </Br><Ikf>.2847 </Ikf><Mje>.377 </Mje><Mjc>.3416 </Mjc><Vaf>74.03 </Vaf><Vjc>.75 </Vjc><Vje>.75 </Vje><Xtf>3 </Xtf><Itf>.6 </Itf><Is>14.34f </Is><Eg>1.11 </Eg></param></library> \ No newline at end of file
diff --git a/src/deviceModelLibrary/Transistor/NPN.lib b/src/deviceModelLibrary/Transistor/NPN.lib
deleted file mode 100644
index 6509fe7a..00000000
--- a/src/deviceModelLibrary/Transistor/NPN.lib
+++ /dev/null
@@ -1,4 +0,0 @@
-.model Q2N2222 NPN( Is=14.34f Xti=3 Eg=1.11 Vaf=74.03 Bf=400 Ne=1.307
-+ Ise=14.34f Ikf=.2847 Xtb=1.5 Br=6.092 Nc=2 Isc=0 Ikr=0 Rc=1 Cjc=7.306p
-+ Mjc=.3416 Vjc=.75 Fc=.5 Cje=22.01p Mje=.377 Vje=.75 Tr=46.91n Tf=411.1p
-+ Itf=.6 Vtf=1.7 Xtf=3 Rb=10)
diff --git a/src/deviceModelLibrary/Transistor/NPN.xml b/src/deviceModelLibrary/Transistor/NPN.xml
deleted file mode 100644
index ee2abcbc..00000000
--- a/src/deviceModelLibrary/Transistor/NPN.xml
+++ /dev/null
@@ -1 +0,0 @@
-<library><model_name>NPN</model_name><ref_model>Q2N2222</ref_model><param><Vtf>1.7 </Vtf><Cjc>7.306p </Cjc><Nc>2 </Nc><Tr>46.91n </Tr><Ne>1.307 </Ne><Cje>22.01p </Cje><Vjc>.75 </Vjc><Xtb>1.5 </Xtb><Rb>10 </Rb><Rc>1 </Rc><Tf>411.1p </Tf><Xti>3 </Xti><Ikr>0 </Ikr><Bf>400</Bf><Fc>.5 </Fc><Ikf>.2847 </Ikf><Br>6.092 </Br><Mje>.377 </Mje><Mjc>.3416 </Mjc><Vaf>74.03 </Vaf><Isc>0 </Isc><Ise>14.34f </Ise><Xtf>3 </Xtf><Vje>.75 </Vje><Is>14.34f </Is><Itf>.6 </Itf><Eg>1.11 </Eg></param></library> \ No newline at end of file
diff --git a/src/deviceModelLibrary/Transistor/PNP.lib b/src/deviceModelLibrary/Transistor/PNP.lib
deleted file mode 100644
index 7edda0ea..00000000
--- a/src/deviceModelLibrary/Transistor/PNP.lib
+++ /dev/null
@@ -1,4 +0,0 @@
-.model Q2N2907A PNP(Is=650.6E-18 Xti=3 Eg=1.11 Vaf=115.7 Bf=231.7 Ne=1.829
-+ Ise=54.81f Ikf=1.079 Xtb=1.5 Br=3.563 Nc=2 Isc=0 Ikr=0 Rc=.715
-+ Cjc=14.76p Mjc=.5383 Vjc=.75 Fc=.5 Cje=19.82p Mje=.3357 Vje=.75
-+ Tr=111.3n Tf=603.7p Itf=.65 Vtf=5 Xtf=1.7 Rb=10)
diff --git a/src/deviceModelLibrary/Transistor/PNP.xml b/src/deviceModelLibrary/Transistor/PNP.xml
deleted file mode 100644
index 681b3fd9..00000000
--- a/src/deviceModelLibrary/Transistor/PNP.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<library>
-<model_name>PNP</model_name>
-<ref_model>Q2N2907A</ref_model>
-<param>
-<Is>650.6E-18</Is>
-<Xti>3 </Xti>
-<Eg>1.11 </Eg>
-<Vaf>115.7 </Vaf>
-<Bf>231.7 </Bf>
-<Ne>1.829</Ne>
-<Ise>54.81f </Ise>
-<Ikf>1.079 </Ikf>
-<Xtb>1.5 </Xtb>
-<Br>3.563 </Br>
-<Nc>2 </Nc>
-<Isc>0 </Isc>
-<Ikr>0</Ikr>
-<Rc>.715</Rc>
-<Cjc>14.76p </Cjc>
-<Mjc>.5383 </Mjc>
-<Vjc>.75 </Vjc>
-<Fc>.5 </Fc>
-<Cje>19.82p </Cje>
-<Mje>.3357 </Mje>
-<Vje>.75</Vje>
-<Tr>111.3n </Tr>
-<Tf>603.7p </Tf>
-<Itf>.65 </Itf>
-<Vtf>5 </Vtf>
-<Xtf>1.7 </Xtf>
-<Rb>10</Rb>
-</param>
-</library>
diff --git a/src/deviceModelLibrary/User Libraries/IN4002.lib b/src/deviceModelLibrary/User Libraries/IN4002.lib
deleted file mode 100644
index 35beac9e..00000000
--- a/src/deviceModelLibrary/User Libraries/IN4002.lib
+++ /dev/null
@@ -1,5 +0,0 @@
-***************************************************************************************************************************************
-*SRC=1N4001G;DI_1N4001G;Diodes;Si; 50.0V 1.00A 2.00us Diodes Inc. Glass Passivated Rectifier
-.MODEL DI_1N4001G D ( IS=65.4p RS=42.2m BV=50.0 IBV=5.00u
-+ CJO=14.8p M=0.333 N=1.36 TT=2.88u )
-*************************************************************************************************************************************** \ No newline at end of file
diff --git a/src/deviceModelLibrary/User Libraries/IN4002.xml b/src/deviceModelLibrary/User Libraries/IN4002.xml
deleted file mode 100644
index e72d83d7..00000000
--- a/src/deviceModelLibrary/User Libraries/IN4002.xml
+++ /dev/null
@@ -1 +0,0 @@
-<library><model_name>D</model_name><ref_model>DI_1N4001G</ref_model><param><CJO>14.8p</CJO><RS>42.2m</RS><IS>65.4p</IS><M>0.333</M><N>1.36</N><BV>50.0</BV><TT>2.88u</TT><IBV>5.00u </IBV></param></library> \ No newline at end of file
diff --git a/src/deviceModelLibrary/User Libraries/ddnpn.lib b/src/deviceModelLibrary/User Libraries/ddnpn.lib
deleted file mode 100644
index 2e46a2f5..00000000
--- a/src/deviceModelLibrary/User Libraries/ddnpn.lib
+++ /dev/null
@@ -1,29 +0,0 @@
-.MODEL ddnpn NPN(
-+ Vtf=10
-+ Cjc=2p
-+ Nc=2
-+ Tr=10n
-+ Ne=1.5
-+ Cje=5p
-+ Vjc=.75
-+ Xtb=1.5
-+ Rc=0
-+ Tf=1n
-+ Xti=3
-+ Ikr=0
-+ Bf=400
-+ Fc=.5
-+ Ikf=0
-+ Br=1
-+ Mje=.3333
-+ Mjc=.3333
-+ Vaf=100
-+ Var=100
-+ Isc=0
-+ Ise=0
-+ Xtf=0
-+ Vje=.75
-+ Is=10f
-+ Itf=1
-+ Eg=1.11
-) \ No newline at end of file
diff --git a/src/deviceModelLibrary/User Libraries/ddnpn.xml b/src/deviceModelLibrary/User Libraries/ddnpn.xml
deleted file mode 100644
index 767c1e41..00000000
--- a/src/deviceModelLibrary/User Libraries/ddnpn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<library><model_name>NPN</model_name><ref_model>ddnpn</ref_model><param><Vtf>10</Vtf><Cjc>2p</Cjc><Nc>2 </Nc><Tr>10n</Tr><Ne>1.5</Ne><Cje>5p</Cje><Vjc>.75 </Vjc><Xtb>1.5 </Xtb><Rc>0</Rc><Tf>1n</Tf><Xti>3 </Xti><Ikr>0 </Ikr><Bf>400 </Bf><Fc>.5 </Fc><Ikf>0</Ikf><Br>1</Br><Mje>.3333</Mje><Mjc>.3333</Mjc><Vaf>100</Vaf><Var>100</Var><Isc>0 </Isc><Ise>0</Ise><Xtf>0</Xtf><Vje>.75 </Vje><Is>10f</Is><Itf>1</Itf><Eg>1.11 </Eg></param></library> \ No newline at end of file
diff --git a/src/deviceModelLibrary/User Libraries/ddpnp.lib b/src/deviceModelLibrary/User Libraries/ddpnp.lib
deleted file mode 100644
index b2ab39b1..00000000
--- a/src/deviceModelLibrary/User Libraries/ddpnp.lib
+++ /dev/null
@@ -1,29 +0,0 @@
-.MODEL ddpnp PNP(
-+ Vtf=10
-+ Cjc=2p
-+ Nc=2
-+ Tr=10n
-+ Ne=1.5
-+ Cje=5p
-+ Vjc=.75
-+ Xtb=1.5
-+ Rc=0
-+ Tf=1n
-+ Xti=3
-+ Ikr=0
-+ Bf=200
-+ Fc=.5
-+ Ikf=0
-+ Br=1
-+ Mje=.3333
-+ Mjc=.3333
-+ Vaf=100
-+ Var=100
-+ Isc=0
-+ Ise=0
-+ Xtf=0
-+ Vje=.75
-+ Is=10f
-+ Itf=1
-+ Eg=1.11
-) \ No newline at end of file
diff --git a/src/deviceModelLibrary/User Libraries/ddpnp.xml b/src/deviceModelLibrary/User Libraries/ddpnp.xml
deleted file mode 100644
index da0a1608..00000000
--- a/src/deviceModelLibrary/User Libraries/ddpnp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<library><model_name>PNP</model_name><ref_model>ddpnp</ref_model><param><Vtf>10</Vtf><Cjc>2p</Cjc><Nc>2 </Nc><Tr>10n</Tr><Ne>1.5</Ne><Cje>5p</Cje><Vjc>.75 </Vjc><Xtb>1.5 </Xtb><Rc>0</Rc><Tf>1n</Tf><Xti>3 </Xti><Ikr>0</Ikr><Bf>200</Bf><Fc>.5 </Fc><Ikf>0</Ikf><Br>1</Br><Mje>.3333</Mje><Mjc>.3333</Mjc><Vaf>100</Vaf><Var>100</Var><Isc>0 </Isc><Ise>0</Ise><Xtf>0</Xtf><Vje>.75</Vje><Is>10f</Is><Itf>1</Itf><Eg>1.11 </Eg></param></library> \ No newline at end of file
diff --git a/src/deviceModelLibrary/User Libraries/emitter.lib b/src/deviceModelLibrary/User Libraries/emitter.lib
deleted file mode 100644
index 3af759f4..00000000
--- a/src/deviceModelLibrary/User Libraries/emitter.lib
+++ /dev/null
@@ -1,4 +0,0 @@
-.MODEL emitter D(
-+ Is=21.3P
-+ N=1.8
-) \ No newline at end of file
diff --git a/src/deviceModelLibrary/User Libraries/emitter.xml b/src/deviceModelLibrary/User Libraries/emitter.xml
deleted file mode 100644
index 4774fb7f..00000000
--- a/src/deviceModelLibrary/User Libraries/emitter.xml
+++ /dev/null
@@ -1 +0,0 @@
-<library><model_name>D</model_name><ref_model>emitter</ref_model><param><Is>21.3P</Is><N>1.8</N></param></library> \ No newline at end of file
diff --git a/src/deviceModelLibrary/User Libraries/npn_1.lib b/src/deviceModelLibrary/User Libraries/npn_1.lib
deleted file mode 100644
index 4a863e3e..00000000
--- a/src/deviceModelLibrary/User Libraries/npn_1.lib
+++ /dev/null
@@ -1,29 +0,0 @@
-.model npn_1 NPN(
-+ Vtf=1.7
-+ Cjc=0.5p
-+ Nc=2
-+ Tr=46.91n
-+ Ne=1.307
-+ Cje=0.5p
-+ Isc=0
-+ Xtb=1.5
-+ Rb=500
-+ Rc=1
-+ Tf=411.1p
-+ Xti=3
-+ Ikr=0
-+ Bf=125
-+ Fc=.5
-+ Ise=14.34f
-+ Br=6.092
-+ Ikf=.2847
-+ Mje=.377
-+ Mjc=.3416
-+ Vaf=74.03
-+ Vjc=.75
-+ Vje=.75
-+ Xtf=3
-+ Itf=.6
-+ Is=14.34f
-+ Eg=1.11
-) \ No newline at end of file
diff --git a/src/deviceModelLibrary/User Libraries/pnp_1.lib b/src/deviceModelLibrary/User Libraries/pnp_1.lib
deleted file mode 100644
index c486429f..00000000
--- a/src/deviceModelLibrary/User Libraries/pnp_1.lib
+++ /dev/null
@@ -1,29 +0,0 @@
-.model pnp_1 PNP(
-+ Vtf=1.7
-+ Cjc=1.5p
-+ Nc=2
-+ Tr=46.91n
-+ Ne=1.307
-+ Cje=0.3p
-+ Isc=0
-+ Xtb=1.5
-+ Rb=250
-+ Rc=1
-+ Tf=411.1p
-+ Xti=3
-+ Ikr=0
-+ Bf=25
-+ Fc=.5
-+ Ise=14.34f
-+ Br=6.092
-+ Ikf=.2847
-+ Mje=.377
-+ Mjc=.3416
-+ Vaf=74.03
-+ Vjc=.75
-+ Vje=.75
-+ Xtf=3
-+ Itf=.6
-+ Is=14.34f
-+ Eg=1.11
-) \ No newline at end of file
diff --git a/src/deviceModelLibrary/User Libraries/userDiode.lib b/src/deviceModelLibrary/User Libraries/userDiode.lib
deleted file mode 100644
index ef18bb50..00000000
--- a/src/deviceModelLibrary/User Libraries/userDiode.lib
+++ /dev/null
@@ -1,20 +0,0 @@
-.MODEL D1N750 D(
-+ Vj=.75
-+ Nbvl=14.976
-+ Cjo=175p
-+ Rs=.25
-+ Isr=1.859n
-+ Eg=1.11
-+ M=.5516
-+ Nbv=1.6989
-+ N=1
-+ Tbv1=-21.277u
-+ Bv=8.1
-+ Fc=.5
-+ Ikf=0
-+ Nr=2
-+ Ibv=20.245m
-+ Is=880.5E-18
-+ Xti=3
-+ Ibvl=1.9556m
-) \ No newline at end of file
diff --git a/src/deviceModelLibrary/User Libraries/userDiode.xml b/src/deviceModelLibrary/User Libraries/userDiode.xml
deleted file mode 100644
index d8584e1d..00000000
--- a/src/deviceModelLibrary/User Libraries/userDiode.xml
+++ /dev/null
@@ -1 +0,0 @@
-<library><model_name>D</model_name><ref_model>D1N750</ref_model><param><Is>880.5E-18</Is><Nbvl>14.976</Nbvl><Cjo>175p</Cjo><Rs>.25</Rs><Isr>1.859n</Isr><Eg>1.11</Eg><M>.5516</M><Nbv>1.6989</Nbv><N>1</N><Tbv1>-21.277u</Tbv1><Bv>8.1</Bv><Fc>.5</Fc><Ikf>0</Ikf><Xti>3</Xti><Nr>2</Nr><Vj>.75</Vj><Ibv>20.245m</Ibv><Ibvl>1.9556m</Ibvl></param></library> \ No newline at end of file