diff --git a/source/Charge.tex b/source/Charge.tex
index 4edcc40d41449e065a2b8083a2cadb3f859cef18..75bc752250b7c6df2b1d0db03c9b37ad570ae07a 100644
--- a/source/Charge.tex
+++ b/source/Charge.tex
@@ -1,6 +1,5 @@
 \begin{modsig}{Charge}
   \gimport[smglom/arithmetics]{realarith}
-  \gimport{DeviceGeometry}
   \gimport{DopingProfile}
   \gimport{PoissonParameters}
   \gimport{DensityElectrons}
diff --git a/source/ContinuityEquationElectrons.tex b/source/ContinuityEquationElectrons.tex
index 7bdb8d80327a2c5a1dc1796ea6c26360ab827ced..aac4cb337c822f76a315e08f05913dac677b6ab3 100644
--- a/source/ContinuityEquationElectrons.tex
+++ b/source/ContinuityEquationElectrons.tex
@@ -1,9 +1,7 @@
 \begin{modsig}{ContinuityEquationElectrons}
   \gimport{CurrentElectrons}
-  \gimport{DensityHoles}
   \gimport{FermiPotentialHoles}
   \gimport{Recombination}
-  \gimport{ElectrostaticPotential}
 \end{modsig}
 
 %%% Local Variables:
diff --git a/source/ContinuityEquationHoles.tex b/source/ContinuityEquationHoles.tex
index c61707e92b84e5e9fcf01f5b468263651260aa85..982f25074bb5d710562796fda3cb2f175bf68e81 100644
--- a/source/ContinuityEquationHoles.tex
+++ b/source/ContinuityEquationHoles.tex
@@ -1,9 +1,7 @@
 \begin{modsig}{ContinuityEquationHoles}
   \gimport{CurrentHoles}
-  \gimport{DensityElectrons}
   \gimport{FermiPotentialElectrons}
   \gimport{Recombination}
-  \gimport{ElectrostaticPotential}
 \end{modsig}
 
 %%% Local Variables:
diff --git a/source/Device.tex b/source/Device.tex
index 93f207cfc2c89bc7076eb61671871d6d1515883d..381f5d47e32ac39326dc08d568a55c2174ac1022 100644
--- a/source/Device.tex
+++ b/source/Device.tex
@@ -1,4 +1,6 @@
 \begin{modsig}{Device}
+    \symi{device}
+    \symii{device}{property}
 \end{modsig}
 %%% Local Variables:
 %%% mode: latex
diff --git a/source/DopingProfile.tex b/source/DopingProfile.tex
index 0e74e1dfc097da566caccf558dde3ed5c13c6c91..2da599bf82215f017711189f5f983b0c04f7eb04 100644
--- a/source/DopingProfile.tex
+++ b/source/DopingProfile.tex
@@ -1,7 +1,5 @@
 \begin{modsig}{DopingProfile}
   \gimport{DeviceGeometry}
-  \gimport[smglom/sets]{functions}
-  \gimport[smglom/arithmetics]{realnumbers}
  
   \symdef[name=doping-profile]{DopingProfile}{C}
   \symtest{DopingProfile}{\DopingProfile}
diff --git a/source/FermiPotentialElectrons.en.tex b/source/FermiPotentialElectrons.en.tex
index 29fdf3712500084d7a2d55a8778c5a0f5d6ea034..74e4a5973cb9e07aab341da1ced28ffb71f3ed2b 100644
--- a/source/FermiPotentialElectrons.en.tex
+++ b/source/FermiPotentialElectrons.en.tex
@@ -1,6 +1,6 @@
 \begin{mhmodnl}{FermiPotentialElectrons}{en}
 \begin{definition}
-  The \defiii{Fermi}{Potential}{Electrons} usually denoted by $\QFPnOp$ is a function
+  The \defiii{Fermi}{potential}{electrons} usually denoted by $\QFPnOp$ is a function
   describing the variation of the quasi-Fermi potentials of the electrons across the
   domain $\DeviceDomain$.  It is linked to the quasi-Fermi level of the electrons which
   controls the occupation of the conduction band and is a measure for the electron density
diff --git a/source/OneDimDeviceGeometry.tex b/source/OneDimDeviceGeometry.tex
index 7e182c4d2e9cccbb57934fcd5a9d2295a944a4ce..18912c9686f55c954f9799349c92e7d904d7e5e5 100644
--- a/source/OneDimDeviceGeometry.tex
+++ b/source/OneDimDeviceGeometry.tex
@@ -1,6 +1,5 @@
 \begin{modsig}{OneDimDeviceGeometry}
   \gimport{OneDimDevice}
-  \gimport{DeviceGeometry}
 \end{modsig}
 
 %%% Local Variables:
diff --git a/source/TwoDimDeviceGeometry.tex b/source/TwoDimDeviceGeometry.tex
index 21825c399dc965718b23c32a33b8d9d45b846708..aafd94a6578f5df95cc9348d9b77cf85362a3001 100644
--- a/source/TwoDimDeviceGeometry.tex
+++ b/source/TwoDimDeviceGeometry.tex
@@ -1,6 +1,5 @@
 \begin{modsig}{TwoDimDeviceGeometry}
   \gimport{TwoDimDevice}
-  \gimport{DeviceGeometry}
   \gimport{PDERegularDomain}
 \end{modsig}