diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
index 98517135..0f59c750 100644
--- a/.github/workflows/pylint.yml
+++ b/.github/workflows/pylint.yml
@@ -20,4 +20,5 @@ jobs:
         pip install pylint
     - name: Analysing the code with pylint
       run: |
-        pylint bookwyrm/ --ignore=migrations --disable=R,C,E1101
+        pylint bookwyrm/ --ignore=migrations --disable=E1101,E1136,R0903,R0901,W0707,W0511
+
diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 4931805f..04211802 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -181,8 +181,6 @@ class EditionForm(CustomForm):
             "authors",
             "parent_work",
             "shelves",
-            "subjects",  # TODO
-            "subject_places",  # TODO
             "connector",
         ]
 
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index d9f3eba9..ba97330d 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -356,7 +356,7 @@ class AnnualGoal(BookWyrmModel):
 
     def get_remote_id(self):
         """put the year in the path"""
-        return "%s/goal/%d" % (self.user.remote_id, self.year)
+        return "{:s}/goal/{:d}".format(self.user.remote_id, self.year)
 
     @property
     def books(self):