diff --git a/luxtronik/cfi/calculations.py b/luxtronik/cfi/calculations.py
index a547d325..784f9be3 100644
--- a/luxtronik/cfi/calculations.py
+++ b/luxtronik/cfi/calculations.py
@@ -27,7 +27,6 @@
 class Calculations(DataVector):
     """Class that holds all calculations."""
 
-    logger = LOGGER
     name = CALCULATIONS_FIELD_NAME
     definitions = CALCULATIONS_DEFINITIONS
 
@@ -55,7 +54,7 @@ def _get_firmware_version(self):
     def get(self, target):
         """Treats certain names specially. For all others, the function of the base class is called."""
         if target == "ID_WEB_SoftStand":
-            self.logger.debug("The name 'ID_WEB_SoftStand' is obsolete! Use 'get_firmware_version()' instead.")
+            LOGGER.debug("The name 'ID_WEB_SoftStand' is obsolete! Use 'get_firmware_version()' instead.")
             entry = Base("ID_WEB_SoftStand")
             entry.raw = self._get_firmware_version()
             return entry
diff --git a/luxtronik/cfi/parameters.py b/luxtronik/cfi/parameters.py
index a27a51c6..345b7d1b 100644
--- a/luxtronik/cfi/parameters.py
+++ b/luxtronik/cfi/parameters.py
@@ -26,7 +26,6 @@
 class Parameters(DataVector):
     """Class that holds all parameters."""
 
-    logger = LOGGER
     name = PARAMETERS_FIELD_NAME
     definitions = PARAMETERS_DEFINITIONS
 
@@ -51,8 +50,8 @@ def set(self, target, value):
                 if isinstance(raw, int):
                     self.queue[index] = raw
                 else:
-                    self.logger.error("Value '%s' for Parameter '%s' not valid!", value, parameter.name)
+                    LOGGER.error("Value '%s' for Parameter '%s' not valid!", value, parameter.name)
             else:
-                self.logger.warning("Parameter '%s' not safe for writing!", parameter.name)
+                LOGGER.warning("Parameter '%s' not safe for writing!", parameter.name)
         else:
-            self.logger.warning("Parameter '%s' not found", target)
+            LOGGER.warning("Parameter '%s' not found", target)
diff --git a/luxtronik/cfi/visibilities.py b/luxtronik/cfi/visibilities.py
index f250564a..79d5f603 100644
--- a/luxtronik/cfi/visibilities.py
+++ b/luxtronik/cfi/visibilities.py
@@ -26,7 +26,6 @@
 class Visibilities(DataVector):
     """Class that holds all visibilities."""
 
-    logger = LOGGER
     name = VISIBILITIES_FIELD_NAME
     definitions = VISIBILITIES_DEFINITIONS
 
diff --git a/luxtronik/data_vector.py b/luxtronik/data_vector.py
index c1deb7bf..d8c2b0d4 100644
--- a/luxtronik/data_vector.py
+++ b/luxtronik/data_vector.py
@@ -20,7 +20,6 @@
 class DataVector:
     """Class that holds a vector of data entries."""
 
-    logger = LOGGER
     name = "DataVector"
 
     _obsolete = {}
@@ -85,7 +84,7 @@ def _lookup(self, target, with_index=False):
 
         target_entry = self._data.get(target_index, None)
         if target_entry is None:
-            self.logger.warning("entry '%s' not found", target)
+            LOGGER.warning("entry '%s' not found", target)
         if with_index:
             return target_index, target_entry
         return target_entry
diff --git a/luxtronik/shi/holdings.py b/luxtronik/shi/holdings.py
index c824a8e1..1df95e68 100644
--- a/luxtronik/shi/holdings.py
+++ b/luxtronik/shi/holdings.py
@@ -26,7 +26,6 @@
 class Holdings(DataVectorSmartHome):
     """Class that holds holding fields."""
 
-    logger = LOGGER
     name = HOLDINGS_FIELD_NAME
     definitions = HOLDINGS_DEFINITIONS
 
diff --git a/luxtronik/shi/inputs.py b/luxtronik/shi/inputs.py
index 7bac711d..3a87f703 100644
--- a/luxtronik/shi/inputs.py
+++ b/luxtronik/shi/inputs.py
@@ -26,7 +26,6 @@
 class Inputs(DataVectorSmartHome):
     """Class that holds input fields."""
 
-    logger = LOGGER
     name = INPUTS_FIELD_NAME
     definitions = INPUTS_DEFINITIONS