diff --git a/master/custom/factories.py b/master/custom/factories.py
index 51e41940..b1868b29 100644
--- a/master/custom/factories.py
+++ b/master/custom/factories.py
@@ -322,6 +322,7 @@ class ClangUbsanLinuxBuild(UnixBuild):
     ]
     factory_tags = ["clang", "ubsan", "sanitizer"]
 
+
 class ClangUbsanFunctionLinuxBuild(UnixBuild):
     buildersuffix = ".clang-ubsan-function"
     configureFlags = [
@@ -332,6 +333,7 @@ class ClangUbsanFunctionLinuxBuild(UnixBuild):
     ]
     factory_tags = ["clang", "ubsan", "sanitizer"]
 
+
 class ClangUnixInstalledBuild(UnixInstalledBuild):
     buildersuffix = ".clang-installed"
     configureFlags = [
@@ -1238,13 +1240,13 @@ def setup(self, parallel, branch, **kwargs):
                 command=["./configure", "--prefix", "$(PWD)/target"] + self.configureFlags
             )
         )
-        
+
         compile = ["make", self.makeTarget]
         if parallel:
             compile = ["make", parallel, self.makeTarget]
-        
+
         self.addStep(Compile(command=compile, env=self.compile_environ))
-        
+
         self.addStep(
             ShellCommand(
                 name="pythoninfo",
@@ -1254,7 +1256,7 @@ def setup(self, parallel, branch, **kwargs):
                 env=self.test_environ,
             )
         )
-        
+
         test = [
             "valgrind",
             "--leak-check=full",
@@ -1264,16 +1266,16 @@ def setup(self, parallel, branch, **kwargs):
             "--track-origins=yes",
             "--trace-children=yes",
             "--suppressions=$(PWD)/Misc/valgrind-python.supp",
-            "./python", 
+            "./python",
             "-m", "test",
             *self.testFlags,
             f"--timeout={self.test_timeout}",
         ]
-        
+
         self.addStep(Test(
             command=test,
             timeout=step_timeout(self.test_timeout),
             env=self.test_environ,
         ))
-        
-        self.addStep(Clean())
\ No newline at end of file
+
+        self.addStep(Clean())
diff --git a/master/custom/pr_testing.py b/master/custom/pr_testing.py
index 3e56a4d2..38b35dab 100644
--- a/master/custom/pr_testing.py
+++ b/master/custom/pr_testing.py
@@ -15,19 +15,19 @@
 
 GITHUB_PROPERTIES_WHITELIST = ["*.labels"]
 
-BUILD_SCHEDULED_MESSAGE = f"""\
-:robot: New build scheduled with the buildbot fleet by @{{user}} for commit {{commit}} :robot:
+BUILD_SCHEDULED_MESSAGE_TEMPLATE = """\
+:robot: New build scheduled with the buildbot fleet by @{user} for commit {commit} :robot:
 
-If you want to schedule another build, you need to add the <kbd>{{label}}</kbd> label again.
+If you want to schedule another build, you need to add the <kbd>{label}</kbd> label again.
 """
 
-BUILD_COMMAND_SCHEDULED_MESSAGE = f"""\
-:robot: New build scheduled with the buildbot fleet by @{{user}} for commit {{commit}} :robot:
+BUILD_COMMAND_SCHEDULED_MESSAGE_TEMPLATE = """\
+:robot: New build scheduled with the buildbot fleet by @{user} for commit {commit} :robot:
 
-The command will test the builders whose names match following regular expression: `{{filter}}`
+The command will test the builders whose names match following regular expression: `{filter}`
 
 The builders matched are:
-{{builders}}
+{builders}
 """
 
 BUILDBOT_COMMAND = re.compile(r"!buildbot (.+)")
@@ -82,7 +82,7 @@ def _remove_label_and_comment(self, payload, label):
         yield http.post(
             url.replace(self.github_api_endpoint, ""),
             json={
-                "body": BUILD_SCHEDULED_MESSAGE.format(
+                "body": BUILD_SCHEDULED_MESSAGE_TEMPLATE.format(
                     user=username, commit=commit, label=label
                 )
             },
@@ -273,7 +273,7 @@ def handle_issue_comment(self, payload, event):
 
         yield self._post_comment(
             payload["issue"]["comments_url"],
-            BUILD_COMMAND_SCHEDULED_MESSAGE.format(
+            BUILD_COMMAND_SCHEDULED_MESSAGE_TEMPLATE.format(
                 user=payload["sender"]["login"],
                 commit=head_sha,
                 filter=builder_filter,
diff --git a/master/master.cfg b/master/master.cfg
index 1934479f..eae305c3 100644
--- a/master/master.cfg
+++ b/master/master.cfg
@@ -49,8 +49,6 @@ from custom.builders import (  # noqa: E402
     get_builders,
     STABLE,
     ONLY_MAIN_BRANCH,
-    TIER_1,
-    TIER_2,
 )
 
 
@@ -139,10 +137,6 @@ c["schedulers"] = []
 
 parallel = {w.name: f"-j{w.parallel_tests}" for w in WORKERS if w.parallel_tests}
 extra_factory_args = {
-    "ware-gentoo-x86": {
-        # test curses as well
-        "test_with_PTY": True,
-    },
     "cstratak-RHEL8-ppc64le": {
         # Increase the timeout on this slow worker
         "timeout_factor": 2,