diff --git a/fdroidserver/index.py b/fdroidserver/index.py
index 56caaad1..29bd24cb 100644
--- a/fdroidserver/index.py
+++ b/fdroidserver/index.py
@@ -163,7 +163,7 @@ def make_v1(apps, packages, repodir, repodict, requestsdict, fdroid_signing_key_
     output['requests'] = requestsdict
 
     # establish sort order of the index
-    v1_sort_packages(packages, repodir, fdroid_signing_key_fingerprints)
+    v1_sort_packages(packages, fdroid_signing_key_fingerprints)
 
     appslist = []
     output['apps'] = appslist
@@ -252,7 +252,7 @@ def make_v1(apps, packages, repodir, repodict, requestsdict, fdroid_signing_key_
         signindex.sign_index_v1(repodir, json_name)
 
 
-def v1_sort_packages(packages, repodir, fdroid_signing_key_fingerprints):
+def v1_sort_packages(packages, fdroid_signing_key_fingerprints):
     """Sorts the supplied list to ensure a deterministic sort order for
     package entries in the index file. This sort-order also expresses
     installation preference to the clients.
diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index d50bfaa1..c0dd55d3 100644
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -52,7 +52,7 @@ def publish_source_tarball(apkfilename, unsigned_dir, output_dir):
         logging.debug('...no source tarball for %s', apkfilename)
 
 
-def key_alias(appid, resolve=False):
+def key_alias(appid):
     """Get the alias which F-Droid uses to indentify the singing key
     for this App in F-Droids keystore.
     """
diff --git a/fdroidserver/signatures.py b/fdroidserver/signatures.py
index 7d82ad14..e104b483 100644
--- a/fdroidserver/signatures.py
+++ b/fdroidserver/signatures.py
@@ -45,7 +45,7 @@ def extract_signature(apkpath):
     return sigdir
 
 
-def extract(config, options):
+def extract(options):
 
     # Create tmp dir if missing…
     tmp_dir = 'tmp'
diff --git a/tests/index.TestCase b/tests/index.TestCase
index 1fd89f7e..15fc4deb 100755
--- a/tests/index.TestCase
+++ b/tests/index.TestCase
@@ -211,7 +211,7 @@ class IndexTest(unittest.TestCase):
                 pass
 
             fdroidserver.index.v1_sort_packages(
-                i, 'repo', fdroidserver.common.load_stats_fdroid_signing_key_fingerprints())
+                i, fdroidserver.common.load_stats_fdroid_signing_key_fingerprints())
             self.maxDiff = None
             self.assertEqual(json.dumps(i, indent=2), json.dumps(o, indent=2))
 
diff --git a/tests/signatures.TestCase b/tests/signatures.TestCase
index bd6648cd..276f9144 100755
--- a/tests/signatures.TestCase
+++ b/tests/signatures.TestCase
@@ -36,7 +36,7 @@ class SignaturesTest(unittest.TestCase):
             APK = [os.path.abspath(os.path.join('repo', 'com.politedroid_3.apk'))]
 
         with TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            signatures.extract(common.config, OptionsFixture())
+            signatures.extract(OptionsFixture())
 
             # check if extracted signatures are where they are supposed to be
             # also verify weather if extracted file contian what they should