diff --git a/gui/wxpython/psmap/dialogs.py b/gui/wxpython/psmap/dialogs.py
index 0bbe779818a..c4784525cc9 100644
--- a/gui/wxpython/psmap/dialogs.py
+++ b/gui/wxpython/psmap/dialogs.py
@@ -3619,7 +3619,7 @@ def _rasterLegend(self, notebook):
         self.Bind(wx.EVT_CHECKBOX, self.OnIsLegend, self.isRLegend)
         self.Bind(wx.EVT_RADIOBUTTON, self.OnDiscrete, self.discrete)
         self.Bind(wx.EVT_RADIOBUTTON, self.OnDiscrete, self.continuous)
-        ##        self.Bind(wx.EVT_CHECKBOX, self.OnDefaultSize, panel.defaultSize)
+        # self.Bind(wx.EVT_CHECKBOX, self.OnDefaultSize, panel.defaultSize)
         self.Bind(wx.EVT_CHECKBOX, self.OnRange, self.range)
         self.rasterSelect.GetTextCtrl().Bind(wx.EVT_TEXT, self.OnRaster)
 
diff --git a/gui/wxpython/psmap/frame.py b/gui/wxpython/psmap/frame.py
index 13fdc91a984..1d937483123 100644
--- a/gui/wxpython/psmap/frame.py
+++ b/gui/wxpython/psmap/frame.py
@@ -780,8 +780,6 @@ def OnAddRaster(self, event):
         if not self._checkMapFrameExists(type_id=id):
             return
 
-        ##        dlg = RasterDialog(self, id = id, settings = self.instruction)
-        # dlg.ShowModal()
         if "mapNotebook" in self.openDialogs:
             self.openDialogs["mapNotebook"].notebook.ChangeSelection(1)
         else:
@@ -800,8 +798,6 @@ def OnAddVect(self, event):
         if not self._checkMapFrameExists(type_id=id):
             return
 
-        ##        dlg = MainVectorDialog(self, id = id, settings = self.instruction)
-        # dlg.ShowModal()
         if "mapNotebook" in self.openDialogs:
             self.openDialogs["mapNotebook"].notebook.ChangeSelection(2)
         else:
diff --git a/pyproject.toml b/pyproject.toml
index 69947daf14e..e12aadd4b8a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -125,8 +125,6 @@ ignore = [
     "DTZ006",  # call-datetime-fromtimestamp
     "DTZ007",  # call-datetime-strptime-without-zone
     "DTZ011",  # call-date-today
-    "E265",    # no-space-after-block-comment
-    "E266",    # multiple-leading-hashes-for-block-comment
     "E402",    # module-import-not-at-top-of-file
     "E501",    # line-too-long
     "E721",    # type-comparison
@@ -367,7 +365,7 @@ ignore = [
 "temporal/t.rast.algebra/testsu*/*_algebra_arithmetic.py" = ["FLY002"]
 "temporal/t.rast.colors/t.rast.colors.py" = ["SIM115"]
 "temporal/t.rast.series/t.rast.series.py" = ["SIM115"]
-"temporal/t.rast.what/t.rast.what.py" = ["SIM115"]
+"temporal/t.rast.what/t.rast.what.py" = ["E265", "E266", "SIM115"]
 "temporal/t.register/testsu*/*_raster_different_local.py" = ["FLY002"]
 "temporal/t.register/testsu*/*_raster_mapmetadata.py" = ["FLY002"]
 "temporal/t.register/testsuite/test_t_register_raster.py" = ["FLY002"]
diff --git a/raster/r.proj/testsuite/test_rproj.py b/raster/r.proj/testsuite/test_rproj.py
index 5f3834be881..678e8b7cd06 100644
--- a/raster/r.proj/testsuite/test_rproj.py
+++ b/raster/r.proj/testsuite/test_rproj.py
@@ -57,7 +57,7 @@ def run_rproj_test(self, method, statics):
             The expected statics of the output raster
         """
         output = method
-        ## Get the boundary and set up region for the projected map
+        # Get the boundary and set up region for the projected map
         stdout = call_module(
             "r.proj",
             project=src_project,
@@ -80,7 +80,7 @@ def run_rproj_test(self, method, statics):
             res=1,
         )
 
-        ## Project the map
+        # Project the map
         self.assertModule(
             "r.proj",
             project=src_project,
@@ -91,13 +91,13 @@ def run_rproj_test(self, method, statics):
             quiet=True,
         )
 
-        ## Validate the output
+        # Validate the output
         self.assertRasterFitsUnivar(output, reference=statics, precision=1e-7)
         self.assertRasterFitsInfo(output, reference=raster_info, precision=1e-7)
 
     def test_nearest(self):
         """Testing method nearest"""
-        ## Set up variables and validation values
+        # Set up variables and validation values
         method = "nearest"
         statics = """n=40930
         min=55.5787925720215
@@ -109,7 +109,7 @@ def test_nearest(self):
 
     def test_bilinear(self):
         """Testing method bilinear"""
-        ## Set up variables and validation values
+        # Set up variables and validation values
         method = "bilinear"
         statics = """n=40845
         min=56.3932914733887
@@ -121,7 +121,7 @@ def test_bilinear(self):
 
     def test_bicubic(self):
         """Testing method bicubic"""
-        ## Set up variables and validation values
+        # Set up variables and validation values
         method = "bicubic"
         statics = """n=40677
         min=56.2407836914062
@@ -133,7 +133,7 @@ def test_bicubic(self):
 
     def test_lanczos(self):
         """Testing method lanczos"""
-        ## Set up variables and validation values
+        # Set up variables and validation values
         method = "lanczos"
         statics = """n=40585
         min=56.2350921630859
@@ -145,7 +145,7 @@ def test_lanczos(self):
 
     def test_bilinear_f(self):
         """Testing method bilinear_f"""
-        ## Set up variables and validation values
+        # Set up variables and validation values
         method = "bilinear_f"
         statics = """n=40930
         min=55.5787925720215
@@ -157,7 +157,7 @@ def test_bilinear_f(self):
 
     def test_bicubic_f(self):
         """Testing method bicubic_f"""
-        ## Set up variables and validation values
+        # Set up variables and validation values
         method = "bicubic_f"
         statics = """n=40930
         min=55.5787925720215
@@ -169,7 +169,7 @@ def test_bicubic_f(self):
 
     def test_lanczos_f(self):
         """Testing method lanczos_f"""
-        ## Set up variables and validation values
+        # Set up variables and validation values
         method = "lanczos_f"
         statics = """n=40930
         min=55.5787925720215