diff --git a/src/__init__.py b/src/__init__.py
index aae3b90..c498e0f 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -17,16 +17,3 @@ if os.path.exists(localedirdev):
 # Set GSettings schema dir (if not set already)
 if not os.environ.get('GSETTINGS_SCHEMA_DIR'):
     os.environ['GSETTINGS_SCHEMA_DIR'] = datadirdev
-
-
-class Environment:
-    """Wrapper class to access environment settings."""
-
-    def get_srcdir():
-        return srcdir
-
-    def get_data(subdir):
-        return os.path.join(datadir, subdir)
-
-    def get_locale():
-        return localedir
diff --git a/src/client.py b/src/client.py
index 5773944..87c71b5 100644
--- a/src/client.py
+++ b/src/client.py
@@ -843,11 +843,6 @@ class Client(Base):
                 if entry and key in delimiters:
                     yield entry
                     entry = {}
-                #if key in entry.keys():
-                #    if entry[key] is not list:
-                #        entry[key] = [entry[key]]
-                #    entry[key].append(value)
-                #else:
                 entry[key] = value
         if entry:
             yield entry
diff --git a/src/serverpanel.py b/src/serverpanel.py
index 6fa7e39..f29c7c4 100644
--- a/src/serverpanel.py
+++ b/src/serverpanel.py
@@ -113,4 +113,3 @@ class ServerPanel(Adw.Bin):
             if id not in device_ids:
                 self.output_devices.remove(
                     self._output_buttons[id].get_parent())
-
diff --git a/src/zeroconf.py b/src/zeroconf.py
index 5fa3363..6dc1f00 100644
--- a/src/zeroconf.py
+++ b/src/zeroconf.py
@@ -29,7 +29,6 @@ class ZeroconfProvider(client.Base):
 
     def on_new_service(self, browser, interface, protocol, name, type, domain,
                        flags):
-        #if not (flags & Avahi.LookupResultFlags.GA_LOOKUP_RESULT_LOCAL):
         service_resolver = Avahi.ServiceResolver(
             interface=interface,
             protocol=protocol,