diff --git a/deckard.py b/deckard.py
index e15b04d41630bf12ed1360855c7d89009b25521a..66860e356fa877105c0acdb2fbb8931c83b7f9af 100755
--- a/deckard.py
+++ b/deckard.py
@@ -288,7 +288,6 @@ def play_object(path, args, prog_cfgs):
     try:
         server.play(prog_under_test_ip)
     finally:
-        name = server.scenario.file
         server.stop()
         for daemon in daemons:
             daemon['proc'].terminate()
diff --git a/pydnstest/augwrap.py b/pydnstest/augwrap.py
index 2e2d43ba4d9792e793b894aaa2a0aba2180f9652..ed8d6a2f7418a3ca689cb6371dda7bc170cfca5f 100644
--- a/pydnstest/augwrap.py
+++ b/pydnstest/augwrap.py
@@ -126,7 +126,7 @@ class AugeasWrapper(object):
 class AugeasNode(collections.MutableMapping):
     """One Augeas tree node with dict-like interface."""
 
-    def __init__(self, aug, path, exists=True):
+    def __init__(self, aug, path):
         """
         Args:
             aug (AugeasWrapper or Augeas): Augeas library instance
diff --git a/pydnstest/scenario.py b/pydnstest/scenario.py
index cacd7ac9a63f72657233a0c727cf60425e83ee20..f532e7959b5b5aef63efa7dc3aa5d454dead2d03 100644
--- a/pydnstest/scenario.py
+++ b/pydnstest/scenario.py
@@ -36,32 +36,6 @@ g_nqueries = 0
 #
 
 
-def create_rr(owner, args, ttl=3600, rdclass='IN', origin='.'):
-    """ Parse RR from tokenized string. """
-    if not owner.endswith('.'):
-        owner += origin
-    try:
-        ttl = dns.ttl.from_text(args[0])
-        args.pop(0)
-    except dns.ttl.BadTTL:
-        pass  # optional
-    try:
-        rdclass = dns.rdataclass.from_text(args[0])
-        args.pop(0)
-    except ValueError:
-        pass  # optional
-    rdtype = args.pop(0)
-    rr = dns.rrset.from_text(owner, ttl, rdclass, rdtype)
-    if args:
-        if rr.rdtype == dns.rdatatype.DS:
-            # convert textual algorithm identifier to number
-            args[1] = str(dns.dnssec.algorithm_from_text(args[1]))
-        rd = dns.rdata.from_text(rr.rdclass, rr.rdtype, ' '.join(
-            args), origin=dns.name.from_text(origin), relativize=False)
-        rr.add(rd)
-    return rr
-
-
 def compare_rrs(expected, got):
     """ Compare lists of RR sets, throw exception if different. """
     for rr in expected:
@@ -149,7 +123,7 @@ def replay_rrs(rrs, nqueries, destination, args=[]):
         name = rr.name
         if 'RAND' in args:
             prefix = ''.join([random.choice(string.ascii_letters + string.digits)
-                              for n in range(8)])
+                              for _ in range(8)])
             name = prefix + '.' + rr.name.to_text()
         msg = dns.message.make_query(name, rr.rdtype, rr.rdclass)
         if 'DO' in args:
@@ -214,7 +188,7 @@ class Entry:
             self.raw_data = binascii.unhexlify(node["/raw"].value)
             self.is_raw_data_entry = True
             return
-        except KeyError as e:
+        except KeyError:
             self.raw_data = None
             self.is_raw_data_entry = False
 
@@ -245,7 +219,7 @@ class Entry:
 
         # MANDATORY
         try:
-            mandatory = list(node.match("/mandatory"))[0].value
+            _ = list(node.match("/mandatory"))[0].value
             self.mandatory = True
         except (KeyError, IndexError):
             self.mandatory = False
@@ -290,13 +264,13 @@ class Entry:
                 if section_name == 'question':
                     if rr.rdtype == dns.rdatatype.AXFR:
                         self.message.xfr = True
-                    self.__rr_add(self.message.question, rr)
+                    self.message.question.append(rr)
                 elif section_name == 'answer':
-                    self.__rr_add(self.message.answer, rr)
+                    self.message.answer.append(rr)
                 elif section_name == 'authority':
-                    self.__rr_add(self.message.authority, rr)
+                    self.message.authority.append(rr)
                 elif section_name == 'additional':
-                    self.__rr_add(self.message.additional, rr)
+                    self.message.additional.append(rr)
 
     def __str__(self):
         txt = 'ENTRY_BEGIN\n'
@@ -464,10 +438,6 @@ class Entry:
                     "!HBB", 1 if family == socket.AF_INET else 2, prefix, 0) + addr))
         self.message.use_edns(edns=version, payload=bufsize, options=opts)
 
-    def __rr_add(self, section, rr):
-        """Append to given section."""
-        section.append(rr)
-
 
 class Range:
     """
@@ -535,7 +505,7 @@ class Range:
         return None
 
 
-class StepLogger(logging.LoggerAdapter):
+class StepLogger(logging.LoggerAdapter):  # pylint: disable=too-few-public-methods
     """
     Prepent Step identification before each log message.
     """
diff --git a/pydnstest/testserver.py b/pydnstest/testserver.py
index 5761f818e74b00ccee2f7f33bb75314b2f0f0544..537477ca450ef73ce93bf547e92caf8be5d5886a 100644
--- a/pydnstest/testserver.py
+++ b/pydnstest/testserver.py
@@ -263,7 +263,6 @@ def standalone_self_test():
     except KeyboardInterrupt:
         logging.info("[==========] Shutdown.")
         pass
-    name = server.scenario.file
     server.stop()