Cleanup: mark unused arguments in UI scripts

Quiet's pylint W0613 warning, also remove some unused args.

46 files changed, 399 insertions, 410 deletions

diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
index 138b5393777..44229b2afdf 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -120,7 +120,7 @@ def register():
     )
     from bpy.types import WindowManager
 
-    def addon_filter_items(self, context):
+    def addon_filter_items(_self, _context):
         import addon_utils
 
         items = [
diff --git a/release/scripts/startup/bl_ui/properties_animviz.py b/release/scripts/startup/bl_ui/properties_animviz.py
index 10a3d1ddb91..6c3c1fd1721 100644
--- a/release/scripts/startup/bl_ui/properties_animviz.py
+++ b/release/scripts/startup/bl_ui/properties_animviz.py
@@ -31,7 +31,7 @@ class MotionPathButtonsPanel:
     bl_label = "Motion Paths"
     # bl_options = {'DEFAULT_CLOSED'}
 
-    def draw_settings(self, context, avs, mpath, bones=False):
+    def draw_settings(self, _context, avs, mpath, bones=False):
         layout = self.layout
 
         mps = avs.motion_path
@@ -89,7 +89,7 @@ class MotionPathButtonsPanel_display:
     bl_region_type = 'WINDOW'
     bl_label = "Display"
 
-    def draw_settings(self, context, avs, mpath, bones=False):
+    def draw_settings(self, _context, avs, mpath, bones=False):
         layout = self.layout
 
         mps = avs.motion_path
diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py
index 0fc67d4aed6..a5353a4e29e 100644
--- a/release/scripts/startup/bl_ui/properties_constraint.py
+++ b/release/scripts/startup/bl_ui/properties_constraint.py
@@ -93,7 +93,7 @@ class ConstraintButtonsPanel:
         col = split.column()
         col.prop(con, "chain_count")
 
-    def CHILD_OF(self, context, layout, con):
+    def CHILD_OF(self, _context, layout, con):
         self.target_template(layout, con)
 
         split = layout.split()
@@ -120,7 +120,7 @@ class ConstraintButtonsPanel:
         row.operator("constraint.childof_set_inverse")
         row.operator("constraint.childof_clear_inverse")
 
-    def TRACK_TO(self, context, layout, con):
+    def TRACK_TO(self, _context, layout, con):
         self.target_template(layout, con)
 
         row = layout.row()
@@ -176,7 +176,7 @@ class ConstraintButtonsPanel:
             sub.active = con.use_rotation
             sub.prop(con, "orient_weight", text="Rotation", slider=True)
 
-    def IK_COPY_POSE(self, context, layout, con):
+    def IK_COPY_POSE(self, _context, layout, con):
         self.target_template(layout, con)
         self.ik_template(layout, con)
 
@@ -211,7 +211,7 @@ class ConstraintButtonsPanel:
         row.prop(con, "lock_rotation_z", text="Z")
         split.active = con.use_rotation
 
-    def IK_DISTANCE(self, context, layout, con):
+    def IK_DISTANCE(self, _context, layout, con):
         self.target_template(layout, con)
         self.ik_template(layout, con)
 
@@ -221,7 +221,7 @@ class ConstraintButtonsPanel:
         row.prop(con, "weight", text="Weight", slider=True)
         row.prop(con, "distance", text="Distance", slider=True)
 
-    def FOLLOW_PATH(self, context, layout, con):
+    def FOLLOW_PATH(self, _context, layout, con):
         self.target_template(layout, con)
         layout.operator("constraint.followpath_path_animate", text="Animate Path", icon='ANIM_DATA')
 
@@ -246,7 +246,7 @@ class ConstraintButtonsPanel:
         row.prop(con, "up_axis", text="Up")
         row.label()
 
-    def LIMIT_ROTATION(self, context, layout, con):
+    def LIMIT_ROTATION(self, _context, layout, con):
         split = layout.split()
 
         col = split.column(align=True)
@@ -276,7 +276,7 @@ class ConstraintButtonsPanel:
         row.label(text="Convert:")
         row.prop(con, "owner_space", text="")
 
-    def LIMIT_LOCATION(self, context, layout, con):
+    def LIMIT_LOCATION(self, _context, layout, con):
         split = layout.split()
 
         col = split.column()
@@ -317,7 +317,7 @@ class ConstraintButtonsPanel:
         row.label(text="Convert:")
         row.prop(con, "owner_space", text="")
 
-    def LIMIT_SCALE(self, context, layout, con):
+    def LIMIT_SCALE(self, _context, layout, con):
         split = layout.split()
 
         col = split.column()
@@ -358,7 +358,7 @@ class ConstraintButtonsPanel:
         row.label(text="Convert:")
         row.prop(con, "owner_space", text="")
 
-    def COPY_ROTATION(self, context, layout, con):
+    def COPY_ROTATION(self, _context, layout, con):
         self.target_template(layout, con)
 
         split = layout.split()
@@ -385,7 +385,7 @@ class ConstraintButtonsPanel:
 
         self.space_template(layout, con)
 
-    def COPY_LOCATION(self, context, layout, con):
+    def COPY_LOCATION(self, _context, layout, con):
         self.target_template(layout, con)
 
         split = layout.split()
@@ -412,7 +412,7 @@ class ConstraintButtonsPanel:
 
         self.space_template(layout, con)
 
-    def COPY_SCALE(self, context, layout, con):
+    def COPY_SCALE(self, _context, layout, con):
         self.target_template(layout, con)
 
         row = layout.row(align=True)
@@ -428,7 +428,7 @@ class ConstraintButtonsPanel:
 
         self.space_template(layout, con)
 
-    def MAINTAIN_VOLUME(self, context, layout, con):
+    def MAINTAIN_VOLUME(self, _context, layout, con):
 
         row = layout.row()
         row.label(text="Free:")
@@ -440,14 +440,14 @@ class ConstraintButtonsPanel:
         row.label(text="Convert:")
         row.prop(con, "owner_space", text="")
 
-    def COPY_TRANSFORMS(self, context, layout, con):
+    def COPY_TRANSFORMS(self, _context, layout, con):
         self.target_template(layout, con)
 
         self.space_template(layout, con)
 
     # def SCRIPT(self, context, layout, con):
 
-    def ACTION(self, context, layout, con):
+    def ACTION(self, _context, layout, con):
         self.target_template(layout, con)
 
         split = layout.split()
@@ -474,7 +474,7 @@ class ConstraintButtonsPanel:
         col.prop(con, "frame_start", text="Start")
         col.prop(con, "frame_end", text="End")
 
-    def LOCKED_TRACK(self, context, layout, con):
+    def LOCKED_TRACK(self, _context, layout, con):
         self.target_template(layout, con)
 
         row = layout.row()
@@ -485,7 +485,7 @@ class ConstraintButtonsPanel:
         row.label(text="Lock:")
         row.prop(con, "lock_axis", expand=True)
 
-    def LIMIT_DISTANCE(self, context, layout, con):
+    def LIMIT_DISTANCE(self, _context, layout, con):
         self.target_template(layout, con)
 
         col = layout.column(align=True)
@@ -502,7 +502,7 @@ class ConstraintButtonsPanel:
 
         self.space_template(layout, con)
 
-    def STRETCH_TO(self, context, layout, con):
+    def STRETCH_TO(self, _context, layout, con):
         self.target_template(layout, con)
 
         row = layout.row()
@@ -532,7 +532,7 @@ class ConstraintButtonsPanel:
         row.label(text="Plane:")
         row.prop(con, "keep_axis", expand=True)
 
-    def FLOOR(self, context, layout, con):
+    def FLOOR(self, _context, layout, con):
         self.target_template(layout, con)
 
         row = layout.row()
@@ -547,7 +547,7 @@ class ConstraintButtonsPanel:
 
         self.space_template(layout, con)
 
-    def RIGID_BODY_JOINT(self, context, layout, con):
+    def RIGID_BODY_JOINT(self, _context, layout, con):
         self.target_template(layout, con, subtargets=False)
 
         layout.prop(con, "pivot_type")
@@ -656,7 +656,7 @@ class ConstraintButtonsPanel:
             col.active = con.use_angular_limit_x
             col.prop(con, "limit_angle_max_x", text="Max")
 
-    def CLAMP_TO(self, context, layout, con):
+    def CLAMP_TO(self, _context, layout, con):
         self.target_template(layout, con)
 
         row = layout.row()
@@ -665,7 +665,7 @@ class ConstraintButtonsPanel:
 
         layout.prop(con, "use_cyclic")
 
-    def TRANSFORM(self, context, layout, con):
+    def TRANSFORM(self, _context, layout, con):
         self.target_template(layout, con)
 
         layout.prop(con, "use_motion_extrapolate", text="Extrapolate")
@@ -742,7 +742,7 @@ class ConstraintButtonsPanel:
 
         self.space_template(layout, con)
 
-    def SHRINKWRAP(self, context, layout, con):
+    def SHRINKWRAP(self, _context, layout, con):
         self.target_template(layout, con, False)
 
         layout.prop(con, "distance")
@@ -776,14 +776,14 @@ class ConstraintButtonsPanel:
             row.active = con.use_track_normal
             row.prop(con, "track_axis", expand=True)
 
-    def DAMPED_TRACK(self, context, layout, con):
+    def DAMPED_TRACK(self, _context, layout, con):
         self.target_template(layout, con)
 
         row = layout.row()
         row.label(text="To:")
         row.prop(con, "track_axis", expand=True)
 
-    def SPLINE_IK(self, context, layout, con):
+    def SPLINE_IK(self, _context, layout, con):
         self.target_template(layout, con)
 
         col = layout.column()
@@ -816,7 +816,7 @@ class ConstraintButtonsPanel:
             col.active = con.use_bulge_min or con.use_bulge_max
             col.prop(con, "bulge_smooth", text="Smooth")
 
-    def PIVOT(self, context, layout, con):
+    def PIVOT(self, _context, layout, con):
         self.target_template(layout, con)
 
         if con.target:
@@ -876,7 +876,7 @@ class ConstraintButtonsPanel:
 
         layout.operator("clip.constraint_to_fcurve")
 
-    def CAMERA_SOLVER(self, context, layout, con):
+    def CAMERA_SOLVER(self, _context, layout, con):
         layout.prop(con, "use_active_clip")
 
         if not con.use_active_clip:
@@ -903,7 +903,7 @@ class ConstraintButtonsPanel:
 
         layout.operator("clip.constraint_to_fcurve")
 
-    def TRANSFORM_CACHE(self, context, layout, con):
+    def TRANSFORM_CACHE(self, _context, layout, con):
         layout.label(text="Cache File Properties:")
         box = layout.box()
         box.template_cache_file(con, "cache_file")
@@ -916,7 +916,7 @@ class ConstraintButtonsPanel:
         if cache_file is not None:
             box.prop_search(con, "object_path", cache_file, "object_paths")
 
-    def SCRIPT(self, context, layout, con):
+    def SCRIPT(self, _context, layout, _con):
         layout.label(text="Blender 2.6 doesn't support python constraints yet")
 
     def ARMATURE(self, context, layout, con):
diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py
index 4e10ac205bf..5687b0df018 100644
--- a/release/scripts/startup/bl_ui/properties_data_armature.py
+++ b/release/scripts/startup/bl_ui/properties_data_armature.py
@@ -103,7 +103,7 @@ class DATA_PT_display(ArmatureButtonsPanel, Panel):
 class DATA_MT_bone_group_context_menu(Menu):
     bl_label = "Bone Group Specials"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("pose.group_sort", icon='SORTALPHA')
diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index 84fe9fb1f3e..6ba3ad4e334 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -184,7 +184,7 @@ class DATA_PT_camera(CameraButtonsPanel, Panel):
     bl_options = {'DEFAULT_CLOSED'}
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         CAMERA_PT_presets.draw_panel_header(self.layout)
 
     def draw(self, context):
@@ -450,7 +450,7 @@ class DATA_PT_camera_safe_areas(CameraButtonsPanel, Panel):
 
         self.layout.prop(cam, "show_safe_areas", text="")
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         SAFE_AREAS_PT_presets.draw_panel_header(self.layout)
 
     def draw(self, context):
diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 5d11373b2e9..e96ec95786f 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -120,7 +120,7 @@ class DATA_PT_gpencil_layers(DataButtonsPanel, Panel):
         else:
             self.draw_layers(context, layout, gpd)
 
-    def draw_layers(self, context, layout, gpd):
+    def draw_layers(self, _context, layout, gpd):
 
         row = layout.row()
 
@@ -338,7 +338,7 @@ class GPENCIL_MT_gpencil_vertex_group(Menu):
 
 
 class GPENCIL_UL_vgroups(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
         vgroup = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
             layout.prop(vgroup, "name", text="", emboss=False, icon_value=icon)
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index eacf027c491..2e849daa17e 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -25,7 +25,7 @@ from rna_prop_ui import PropertyPanel
 class MESH_MT_vertex_group_context_menu(Menu):
     bl_label = "Vertex Group Specials"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("object.vertex_group_sort", icon='SORTALPHA', text="Sort by Name").sort_type = 'NAME'
@@ -51,7 +51,7 @@ class MESH_MT_vertex_group_context_menu(Menu):
 class MESH_MT_shape_key_context_menu(Menu):
     bl_label = "Shape Key Specials"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("object.shape_key_add", icon='ADD', text="New Shape From Mix").from_mix = True
@@ -69,7 +69,7 @@ class MESH_MT_shape_key_context_menu(Menu):
 
 
 class MESH_UL_vgroups(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data_, _active_propname, _index):
         # assert(isinstance(item, bpy.types.VertexGroup))
         vgroup = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
@@ -82,7 +82,7 @@ class MESH_UL_vgroups(UIList):
 
 
 class MESH_UL_fmaps(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
         # assert(isinstance(item, bpy.types.FaceMap))
         fmap = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
@@ -93,7 +93,7 @@ class MESH_UL_fmaps(UIList):
 
 
 class MESH_UL_shape_keys(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, active_data, _active_propname, index):
         # assert(isinstance(item, bpy.types.ShapeKey))
         obj = active_data
         # key = data
@@ -117,7 +117,7 @@ class MESH_UL_shape_keys(UIList):
 
 
 class MESH_UL_uvmaps(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
         # assert(isinstance(item, (bpy.types.MeshTexturePolyLayer, bpy.types.MeshLoopColorLayer)))
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
             layout.prop(item, "name", text="", emboss=False, icon='GROUP_UVS')
@@ -129,7 +129,7 @@ class MESH_UL_uvmaps(UIList):
 
 
 class MESH_UL_vcols(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
         # assert(isinstance(item, (bpy.types.MeshTexturePolyLayer, bpy.types.MeshLoopColorLayer)))
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
             layout.prop(item, "name", text="", emboss=False, icon='GROUP_VCOL')
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 8e0021b64a8..668dd61315d 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -79,7 +79,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
 
         split.prop(md, "use_multi_modifier")
 
-    def ARRAY(self, layout, ob, md):
+    def ARRAY(self, layout, _ob, md):
         layout.prop(md, "fit_type")
 
         if md.fit_type == 'FIXED_COUNT':
@@ -171,7 +171,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         layout.row().prop(md, "miter_inner")
         layout.row().prop(md, "spread")
 
-    def BOOLEAN(self, layout, ob, md):
+    def BOOLEAN(self, layout, _ob, md):
         split = layout.split()
 
         col = split.column()
@@ -187,7 +187,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         if bpy.app.debug:
             layout.prop(md, "debug_options")
 
-    def BUILD(self, layout, ob, md):
+    def BUILD(self, layout, _ob, md):
         split = layout.split()
 
         col = split.column()
@@ -201,7 +201,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         sub.active = md.use_random_order
         sub.prop(md, "seed")
 
-    def MESH_CACHE(self, layout, ob, md):
+    def MESH_CACHE(self, layout, _ob, md):
         layout.prop(md, "cache_format")
         layout.prop(md, "filepath")
 
@@ -288,10 +288,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         if md.object:
             col.prop(md, "use_transform")
 
-    def CLOTH(self, layout, ob, md):
+    def CLOTH(self, layout, _ob, _md):
         layout.label(text="Settings are inside the Physics tab")
 
-    def COLLISION(self, layout, ob, md):
+    def COLLISION(self, layout, _ob, _md):
         layout.label(text="Settings are inside the Physics tab")
 
     def CURVE(self, layout, ob, md):
@@ -386,10 +386,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         row.prop(md, "mid_level")
         row.prop(md, "strength")
 
-    def DYNAMIC_PAINT(self, layout, ob, md):
+    def DYNAMIC_PAINT(self, layout, _ob, _md):
         layout.label(text="Settings are inside the Physics tab")
 
-    def EDGE_SPLIT(self, layout, ob, md):
+    def EDGE_SPLIT(self, layout, _ob, md):
         split = layout.split()
 
         col = split.column()
@@ -421,7 +421,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
 
         layout.operator("object.explode_refresh", text="Refresh")
 
-    def FLUID_SIMULATION(self, layout, ob, md):
+    def FLUID_SIMULATION(self, layout, _ob, _md):
         layout.label(text="Settings are inside the Physics tab")
 
     def HOOK(self, layout, ob, md):
@@ -575,7 +575,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         else:
             layout.operator("object.meshdeform_bind", text="Bind")
 
-    def MIRROR(self, layout, ob, md):
+    def MIRROR(self, layout, _ob, md):
         axis_text = "XYZ"
         split = layout.split(factor=0.33)
 
@@ -673,7 +673,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
             row.operator("object.multires_external_save", text="Save External...")
             row.label()
 
-    def OCEAN(self, layout, ob, md):
+    def OCEAN(self, layout, _ob, md):
         if not bpy.app.build_options.mod_oceansim:
             layout.label(text="Built without OceanSim modifier")
             return
@@ -809,10 +809,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.prop_search(md, "index_layer_name", ob.data, "vertex_colors", text="Index Layer")
         col.prop_search(md, "value_layer_name", ob.data, "vertex_colors", text="Value Layer")
 
-    def PARTICLE_SYSTEM(self, layout, ob, md):
+    def PARTICLE_SYSTEM(self, layout, _ob, _md):
         layout.label(text="Settings can be found inside the Particle context")
 
-    def SCREW(self, layout, ob, md):
+    def SCREW(self, layout, _ob, md):
         split = layout.split()
 
         col = split.column()
@@ -932,7 +932,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
             col.prop(md, "angle")
         col.prop(md, "limits", slider=True)
 
-    def SMOKE(self, layout, ob, md):
+    def SMOKE(self, layout, _ob, _md):
         layout.label(text="Settings are inside the Physics tab")
 
     def SMOOTH(self, layout, ob, md):
@@ -950,7 +950,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.label(text="Vertex Group:")
         col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
 
-    def SOFT_BODY(self, layout, ob, md):
+    def SOFT_BODY(self, layout, _ob, _md):
         layout.label(text="Settings are inside the Physics tab")
 
     def SOLIDIFY(self, layout, ob, md):
@@ -1049,10 +1049,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
             preview = max(scene.cycles.preview_dicing_rate * ob.cycles.dicing_rate, 0.1)
             col.label(text=f"Render {render:.2f} px, Preview {preview:.2f} px")
 
-    def SURFACE(self, layout, ob, md):
+    def SURFACE(self, layout, _ob, _md):
         layout.label(text="Settings are inside the Physics tab")
 
-    def SURFACE_DEFORM(self, layout, ob, md):
+    def SURFACE_DEFORM(self, layout, _ob, md):
         col = layout.column()
         col.active = not md.is_bound
 
@@ -1190,7 +1190,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.prop(md, "width", slider=True)
         col.prop(md, "narrowness", slider=True)
 
-    def REMESH(self, layout, ob, md):
+    def REMESH(self, layout, _ob, md):
         if not bpy.app.build_options.mod_remesh:
             layout.label(text="Built without Remesh modifier")
             return
@@ -1331,7 +1331,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         layout.separator()
         self.vertex_weight_mask(layout, ob, md)
 
-    def SKIN(self, layout, ob, md):
+    def SKIN(self, layout, _ob, md):
         row = layout.row()
         row.operator("object.skin_armature_create", text="Create Armature")
         row.operator("mesh.customdata_skin_add")
@@ -1360,7 +1360,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.prop(md, "use_y_symmetry")
         col.prop(md, "use_z_symmetry")
 
-    def TRIANGULATE(self, layout, ob, md):
+    def TRIANGULATE(self, layout, _ob, md):
         row = layout.row()
 
         col = row.column()
diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py
index a4c109b150a..095bd182ad4 100644
--- a/release/scripts/startup/bl_ui/properties_freestyle.py
+++ b/release/scripts/startup/bl_ui/properties_freestyle.py
@@ -90,7 +90,7 @@ class ViewLayerFreestyleEditorButtonsPanel(ViewLayerFreestyleButtonsPanel):
 
 
 class VIEWLAYER_UL_linesets(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, index):
         lineset = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
             layout.prop(lineset, "name", text="", emboss=False, icon_value=icon)
@@ -103,7 +103,7 @@ class VIEWLAYER_UL_linesets(UIList):
 class RENDER_MT_lineset_context_menu(Menu):
     bl_label = "Lineset Specials"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.operator("scene.freestyle_lineset_copy", icon='COPYDOWN')
         layout.operator("scene.freestyle_lineset_paste", icon='PASTEDOWN')
@@ -289,7 +289,7 @@ class VIEWLAYER_PT_freestyle_linestyle(ViewLayerFreestyleEditorButtonsPanel, Pan
         sub.operator("scene.freestyle_modifier_move", icon='TRIA_DOWN', text="").direction = 'DOWN'
         sub.operator("scene.freestyle_modifier_remove", icon='X', text="")
 
-    def draw_modifier_box_error(self, box, modifier, message):
+    def draw_modifier_box_error(self, box, _modifier, message):
         row = box.row()
         row.label(text=message, icon='ERROR')
 
@@ -514,7 +514,7 @@ class VIEWLAYER_PT_freestyle_linestyle(ViewLayerFreestyleEditorButtonsPanel, Pan
                     message = "Enable Face Smoothness to use this modifier"
                     self.draw_modifier_box_error(col.box(), modifier, message)
 
-    def draw_geometry_modifier(self, context, modifier):
+    def draw_geometry_modifier(self, _context, modifier):
         layout = self.layout
 
         col = layout.column(align=True)
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 6e1253df968..1fd106fbe35 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -85,7 +85,7 @@ class AnnotationDrawingToolsPanel:
     bl_region_type = 'TOOLS'
 
     @classmethod
-    def poll(cls, context):
+    def poll(cls, _context):
         return True
 
     def draw(self, context):
@@ -510,7 +510,7 @@ class GPENCIL_MT_pie_tools_more(Menu):
         gpd = context.gpencil_data
         return bool(gpd and gpd.use_stroke_edit_mode and context.editable_gpencil_strokes)
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         pie = layout.menu_pie()
@@ -586,7 +586,7 @@ class GPENCIL_MT_pie_sculpt(Menu):
 class GPENCIL_MT_snap(Menu):
     bl_label = "Snap"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("gpencil.snap_to_grid", text="Selection to Grid")
@@ -603,7 +603,7 @@ class GPENCIL_MT_snap(Menu):
 class GPENCIL_MT_separate(Menu):
     bl_label = "Separate"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.operator("gpencil.stroke_separate", text="Selected Points").mode = 'POINT'
         layout.operator("gpencil.stroke_separate", text="Selected Strokes").mode = 'STROKE'
@@ -613,7 +613,7 @@ class GPENCIL_MT_separate(Menu):
 class GPENCIL_MT_gpencil_draw_delete(Menu):
     bl_label = "GPencil Draw Delete"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_REGION_WIN'
@@ -624,7 +624,7 @@ class GPENCIL_MT_gpencil_draw_delete(Menu):
 class GPENCIL_MT_cleanup(Menu):
     bl_label = "Clean Up"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.operator("gpencil.frame_clean_loose", text="Loose Points")
         layout.separator()
@@ -637,7 +637,7 @@ class GPENCIL_MT_cleanup(Menu):
 
 
 class GPENCIL_UL_annotation_layer(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
         # assert(isinstance(item, bpy.types.GPencilLayer)
         gpl = item
 
@@ -892,7 +892,7 @@ class GreasePencilMaterialsPanel:
 
 
 class GPENCIL_UL_layer(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
         # assert(isinstance(item, bpy.types.GPencilLayer)
         gpl = item
 
diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py
index 509424278b0..6d22ad516a4 100644
--- a/release/scripts/startup/bl_ui/properties_mask_common.py
+++ b/release/scripts/startup/bl_ui/properties_mask_common.py
@@ -25,8 +25,8 @@ from bpy.types import Menu, UIList
 
 
 class MASK_UL_layers(UIList):
-    def draw_item(self, context, layout, data, item, icon,
-                  active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon,
+                  _active_data, _active_propname, _index):
         # assert(isinstance(item, bpy.types.MaskLayer)
         mask = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
@@ -246,7 +246,7 @@ class MASK_PT_transforms:
         space_data = context.space_data
         return space_data.mask and space_data.mode == 'MASK'
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         col = layout.column(align=True)
@@ -260,7 +260,7 @@ class MASK_PT_transforms:
 class MASK_MT_add(Menu):
     bl_label = "Add"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mask.primitive_circle_add", icon='MESH_CIRCLE')
@@ -270,7 +270,7 @@ class MASK_MT_add(Menu):
 class MASK_MT_mask(Menu):
     bl_label = "Mask"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mask.delete")
@@ -299,7 +299,7 @@ class MASK_MT_mask(Menu):
 class MASK_MT_visibility(Menu):
     bl_label = "Show/Hide"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mask.hide_view_clear")
@@ -310,7 +310,7 @@ class MASK_MT_visibility(Menu):
 class MASK_MT_transform(Menu):
     bl_label = "Transform"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("transform.translate")
@@ -322,7 +322,7 @@ class MASK_MT_transform(Menu):
 class MASK_MT_animation(Menu):
     bl_label = "Animation"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mask.shape_key_clear")
@@ -334,7 +334,7 @@ class MASK_MT_animation(Menu):
 class MASK_MT_select(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mask.select_all", text="All").action = 'SELECT'
diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py
index 145e9cf4c06..79efd92f222 100644
--- a/release/scripts/startup/bl_ui/properties_material.py
+++ b/release/scripts/startup/bl_ui/properties_material.py
@@ -26,7 +26,7 @@ from bpy_extras.node_utils import find_node_input
 class MATERIAL_MT_context_menu(Menu):
     bl_label = "Material Specials"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("material.copy", icon='COPYDOWN')
@@ -36,7 +36,7 @@ class MATERIAL_MT_context_menu(Menu):
 
 class MATERIAL_UL_matslots(UIList):
 
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
         # assert(isinstance(item, bpy.types.MaterialSlot)
         # ob = data
         slot = item
@@ -145,7 +145,7 @@ class EEVEE_MATERIAL_PT_context_material(MaterialButtonsPanel, Panel):
             row.template_ID(space, "pin_id")
 
 
-def panel_node_draw(layout, ntree, output_type, input_name):
+def panel_node_draw(layout, ntree, _output_type, input_name):
     node = ntree.get_output_node('EEVEE')
 
     if node:
diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index 51ad691f1d7..3ba18049a2e 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -30,7 +30,7 @@ from .properties_grease_pencil_common import (
 class GPENCIL_MT_color_context_menu(Menu):
     bl_label = "Layer"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("gpencil.color_reveal", icon='RESTRICT_VIEW_OFF', text="Show All")
@@ -46,7 +46,7 @@ class GPENCIL_MT_color_context_menu(Menu):
 
 
 class GPENCIL_UL_matslots(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
         slot = item
         ma = slot.material
         if (ma is not None) and (ma.grease_pencil is not None):
@@ -104,10 +104,10 @@ class MATERIAL_PT_gpencil_slots(GreasePencilMaterialsPanel, Panel):
 class MATERIAL_PT_gpencil_surface(GPMaterialButtonsPanel, Panel):
     bl_label = "Surface"
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         MATERIAL_PT_gpencil_material_presets.draw_panel_header(self.layout)
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.use_property_split = True
 
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index 59ff21e1dd7..323ab463792 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -165,7 +165,7 @@ class OBJECT_PT_relations(ObjectButtonsPanel, Panel):
 class COLLECTION_MT_context_menu(Menu):
     bl_label = "Collection Specials"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("object.collection_unlink", icon='X')
diff --git a/release/scripts/startup/bl_ui/properties_output.py b/release/scripts/startup/bl_ui/properties_output.py
index 02b38f1dc8b..f24adbbcf91 100644
--- a/release/scripts/startup/bl_ui/properties_output.py
+++ b/release/scripts/startup/bl_ui/properties_output.py
@@ -61,7 +61,7 @@ class RENDER_PT_dimensions(RenderOutputButtonsPanel, Panel):
     _frame_rate_args_prev = None
     _preset_class = None
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         RENDER_PT_presets.draw_panel_header(self.layout)
 
     @staticmethod
@@ -332,7 +332,7 @@ class RENDER_PT_encoding(RenderOutputButtonsPanel, Panel):
     bl_options = {'DEFAULT_CLOSED'}
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         RENDER_PT_ffmpeg_presets.draw_panel_header(self.layout)
 
     @classmethod
@@ -443,7 +443,7 @@ class RENDER_PT_encoding_audio(RenderOutputButtonsPanel, Panel):
 
 
 class RENDER_UL_renderviews(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, index):
         view = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
             if view.name in {"left", "right"}:
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 9ebcf137688..a955f6b9b40 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -108,7 +108,7 @@ class VIEW3D_MT_tools_projectpaint_clone(Menu):
             props.value = i
 
 
-def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=False):
+def brush_texpaint_common(panel, context, layout, brush, _settings, projpaint=False):
     capabilities = brush.image_paint_capabilities
 
     col = layout.column()
@@ -136,7 +136,7 @@ def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=Fal
         brush_basic_texpaint_settings(col, context, brush)
 
 
-def brush_texpaint_common_clone(panel, context, layout, brush, settings, projpaint=False):
+def brush_texpaint_common_clone(_panel, context, layout, _brush, settings, _projpaint=False):
     ob = context.active_object
     col = layout.column()
 
@@ -164,7 +164,7 @@ def brush_texpaint_common_clone(panel, context, layout, brush, settings, projpai
         col.menu("VIEW3D_MT_tools_projectpaint_clone", text=clone_text, translate=False)
 
 
-def brush_texpaint_common_color(panel, context, layout, brush, settings, projpaint=False):
+def brush_texpaint_common_color(_panel, context, layout, brush, _settings, _projpaint=False):
     capabilities = brush.image_paint_capabilities
 
     UnifiedPaintPanel.prop_unified_color_picker(layout, context, brush, "color", value_slider=True)
@@ -176,7 +176,7 @@ def brush_texpaint_common_color(panel, context, layout, brush, settings, projpai
     row.operator("paint.brush_colors_flip", icon='FILE_REFRESH', text="", emboss=False)
 
 
-def brush_texpaint_common_gradient(panel, context, layout, brush, settings, projpaint=False):
+def brush_texpaint_common_gradient(_panel, context, layout, brush, _settings, _projpaint=False):
     layout.template_color_ramp(brush, "gradient", expand=True)
 
     layout.use_property_split = True
@@ -192,7 +192,7 @@ def brush_texpaint_common_gradient(panel, context, layout, brush, settings, proj
         col.prop(brush, "gradient_fill_mode")
 
 
-def brush_texpaint_common_options(panel, context, layout, brush, settings, projpaint=False):
+def brush_texpaint_common_options(_panel, _context, layout, brush, _settings, projpaint=False):
     capabilities = brush.image_paint_capabilities
 
     col = layout.column()
@@ -372,7 +372,7 @@ def brush_basic_sculpt_settings(layout, context, brush, *, compact=False):
         layout.row().prop(brush, "direction", expand=True, **({"text": ""} if compact else {}))
 
 
-def brush_basic_gpencil_paint_settings(layout, context, brush, *, compact=True):
+def brush_basic_gpencil_paint_settings(layout, _context, brush, *, _compact=True):
     gp_settings = brush.gpencil_settings
 
     # Brush details
@@ -446,7 +446,7 @@ def brush_basic_gpencil_sculpt_settings(layout, context, brush, *, compact=False
         layout.use_property_split = use_property_split_prev
 
 
-def brush_basic_gpencil_weight_settings(layout, context, brush, *, compact=False):
+def brush_basic_gpencil_weight_settings(layout, _context, brush, *, _compact=False):
     layout.prop(brush, "size", slider=True)
 
     row = layout.row(align=True)
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index 0667bff8177..6414c1ceede 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -69,7 +69,7 @@ class PARTICLE_MT_context_menu(Menu):
     bl_label = "Particle Specials"
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         props = layout.operator(
@@ -122,7 +122,7 @@ def find_modifier(ob, psys):
 
 class PARTICLE_UL_particle_systems(bpy.types.UIList):
 
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index, flt_flag):
+    def draw_item(self, _context, layout, data, item, icon, _active_data, _active_propname, _index, _flt_flag):
         ob = data
         psys = item
 
@@ -500,7 +500,7 @@ class PARTICLE_PT_cache(ParticleButtonsPanel, Panel):
     def draw(self, context):
         psys = context.particle_system
 
-        point_cache_ui(self, context, psys.point_cache, True, 'HAIR' if (psys.settings.type == 'HAIR') else 'PSYS')
+        point_cache_ui(self, psys.point_cache, True, 'HAIR' if (psys.settings.type == 'HAIR') else 'PSYS')
 
 
 class PARTICLE_PT_velocity(ParticleButtonsPanel, Panel):
@@ -1813,7 +1813,7 @@ class PARTICLE_PT_field_weights(ParticleButtonsPanel, Panel):
 
     def draw(self, context):
         part = particle_get_settings(context)
-        effector_weights_ui(self, context, part.effector_weights, 'PSYS')
+        effector_weights_ui(self, part.effector_weights, 'PSYS')
 
         if part.type == 'HAIR':
             row = self.layout.row()
@@ -1852,7 +1852,7 @@ class PARTICLE_PT_force_fields_type1(ParticleButtonsPanel, Panel):
 
         col = layout.column()
         col.prop(part.force_field_1, "type", text="Type 1")
-        basic_force_field_settings_ui(self, context, part.force_field_1)
+        basic_force_field_settings_ui(self, part.force_field_1)
 
 
 class PARTICLE_PT_force_fields_type2(ParticleButtonsPanel, Panel):
@@ -1868,7 +1868,7 @@ class PARTICLE_PT_force_fields_type2(ParticleButtonsPanel, Panel):
 
         col = layout.column()
         col.prop(part.force_field_2, "type", text="Type 2")
-        basic_force_field_settings_ui(self, context, part.force_field_2)
+        basic_force_field_settings_ui(self, part.force_field_2)
 
 
 class PARTICLE_PT_force_fields_type1_falloff(ParticleButtonsPanel, Panel):
@@ -1883,7 +1883,7 @@ class PARTICLE_PT_force_fields_type1_falloff(ParticleButtonsPanel, Panel):
 
         part = particle_get_settings(context)
 
-        basic_force_field_falloff_ui(self, context, part.force_field_1)
+        basic_force_field_falloff_ui(self, part.force_field_1)
 
 
 class PARTICLE_PT_force_fields_type2_falloff(ParticleButtonsPanel, Panel):
@@ -1898,7 +1898,7 @@ class PARTICLE_PT_force_fields_type2_falloff(ParticleButtonsPanel, Panel):
 
         part = particle_get_settings(context)
 
-        basic_force_field_falloff_ui(self, context, part.force_field_2)
+        basic_force_field_falloff_ui(self, part.force_field_2)
 
 
 class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_physics_cloth.py b/release/scripts/startup/bl_ui/properties_physics_cloth.py
index f3d84a7acc0..7463f10185d 100644
--- a/release/scripts/startup/bl_ui/properties_physics_cloth.py
+++ b/release/scripts/startup/bl_ui/properties_physics_cloth.py
@@ -55,7 +55,7 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, Panel):
     bl_label = "Cloth"
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         CLOTH_PT_presets.draw_panel_header(self.layout)
 
     def draw(self, context):
@@ -169,7 +169,7 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel, Panel):
 
     def draw(self, context):
         md = context.cloth
-        point_cache_ui(self, context, md.point_cache, cloth_panel_enabled(md), 'CLOTH')
+        point_cache_ui(self, md.point_cache, cloth_panel_enabled(md), 'CLOTH')
 
 
 class PHYSICS_PT_cloth_shape(PhysicButtonsPanel, Panel):
@@ -373,7 +373,7 @@ class PHYSICS_PT_cloth_field_weights(PhysicButtonsPanel, Panel):
 
     def draw(self, context):
         cloth = context.cloth.settings
-        effector_weights_ui(self, context, cloth.effector_weights, 'CLOTH')
+        effector_weights_ui(self, cloth.effector_weights, 'CLOTH')
 
 
 classes = (
diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py
index 11a9b250454..aeeb4714d46 100644
--- a/release/scripts/startup/bl_ui/properties_physics_common.py
+++ b/release/scripts/startup/bl_ui/properties_physics_common.py
@@ -35,7 +35,7 @@ class PhysicButtonsPanel:
         return (context.object) and context.engine in cls.COMPAT_ENGINES
 
 
-def physics_add(self, layout, md, name, type, typeicon, toggles):
+def physics_add(layout, md, name, type, _typeicon, toggles):
     row = layout.row(align=True)
     if md:
         row.context_pointer_set("modifier", md)
@@ -57,7 +57,7 @@ def physics_add(self, layout, md, name, type, typeicon, toggles):
         ).type = type
 
 
-def physics_add_special(self, layout, data, name, addop, removeop, typeicon):
+def physics_add_special(layout, data, name, addop, removeop, _typeicon):
     row = layout.row(align=True)
     if data:
         row.operator(removeop, text=name, text_ctxt=i18n_contexts.default, icon='X')
@@ -89,23 +89,21 @@ class PHYSICS_PT_add(PhysicButtonsPanel, Panel):
             col.operator("object.forcefield_toggle", text="Force Field", icon='X')
 
         if obj.type == 'MESH':
-            physics_add(self, col, context.collision, "Collision", 'COLLISION', 'MOD_PHYSICS', False)
-            physics_add(self, col, context.cloth, "Cloth", 'CLOTH', 'MOD_CLOTH', True)
-            physics_add(
-                self, col, context.dynamic_paint, "Dynamic Paint", 'DYNAMIC_PAINT', 'MOD_DYNAMICPAINT', True
-            )
+            physics_add(col, context.collision, "Collision", 'COLLISION', 'MOD_PHYSICS', False)
+            physics_add(col, context.cloth, "Cloth", 'CLOTH', 'MOD_CLOTH', True)
+            physics_add(col, context.dynamic_paint, "Dynamic Paint", 'DYNAMIC_PAINT', 'MOD_DYNAMICPAINT', True)
 
         col = flow.column()
 
         if obj.type in {'MESH', 'LATTICE', 'CURVE', 'SURFACE', 'FONT'}:
-            physics_add(self, col, context.soft_body, "Soft Body", 'SOFT_BODY', 'MOD_SOFT', True)
+            physics_add(col, context.soft_body, "Soft Body", 'SOFT_BODY', 'MOD_SOFT', True)
 
         if obj.type == 'MESH':
-            physics_add(self, col, context.fluid, "Fluid", 'FLUID_SIMULATION', 'MOD_FLUIDSIM', True)
-            physics_add(self, col, context.smoke, "Smoke", 'SMOKE', 'MOD_SMOKE', True)
+            physics_add(col, context.fluid, "Fluid", 'FLUID_SIMULATION', 'MOD_FLUIDSIM', True)
+            physics_add(col, context.smoke, "Smoke", 'SMOKE', 'MOD_SMOKE', True)
 
             physics_add_special(
-                self, col, obj.rigid_body, "Rigid Body",
+                col, obj.rigid_body, "Rigid Body",
                 "rigidbody.object_add",
                 "rigidbody.object_remove",
                 'MESH_ICOSPHERE'
@@ -113,7 +111,7 @@ class PHYSICS_PT_add(PhysicButtonsPanel, Panel):
 
         # all types of objects can have rigid body constraint.
         physics_add_special(
-            self, col, obj.rigid_body_constraint, "Rigid Body Constraint",
+            col, obj.rigid_body_constraint, "Rigid Body Constraint",
             "rigidbody.constraint_add",
             "rigidbody.constraint_remove",
             'CONSTRAINT'
@@ -122,7 +120,7 @@ class PHYSICS_PT_add(PhysicButtonsPanel, Panel):
 
 # cache-type can be 'PSYS' 'HAIR' 'SMOKE' etc.
 
-def point_cache_ui(self, context, cache, enabled, cachetype):
+def point_cache_ui(self, cache, enabled, cachetype):
     layout = self.layout
     layout.use_property_split = True
 
@@ -243,7 +241,7 @@ def point_cache_ui(self, context, cache, enabled, cachetype):
         col.operator("ptcache.bake_all", text="Update All To Frame").bake = False
 
 
-def effector_weights_ui(self, context, weights, weight_type):
+def effector_weights_ui(self, weights, weight_type):
     layout = self.layout
     layout.use_property_split = True
 
@@ -280,7 +278,7 @@ def effector_weights_ui(self, context, weights, weight_type):
     col.prop(weights, "boid", slider=True)
 
 
-def basic_force_field_settings_ui(self, context, field):
+def basic_force_field_settings_ui(self, field):
     layout = self.layout
     layout.use_property_split = True
 
@@ -333,7 +331,7 @@ def basic_force_field_settings_ui(self, context, field):
     col.prop(field, "use_absorption")
 
 
-def basic_force_field_falloff_ui(self, context, field):
+def basic_force_field_falloff_ui(self, field):
     layout = self.layout
 
     if not field or field.type == 'NONE':
diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
index 05b531f9a1f..83a7524fe03 100644
--- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
+++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
@@ -29,7 +29,7 @@ from .properties_physics_common import (
 
 
 class PHYSICS_UL_dynapaint_surfaces(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
         # assert(isinstance(item, bpy.types.DynamicPaintSurface)
         surf = item
         sticon = layout.enum_item_icon(surf, "surface_type", surf.surface_type)
@@ -557,7 +557,7 @@ class PHYSICS_PT_dp_effects(PhysicButtonsPanel, Panel):
 
         return (context.engine in cls.COMPAT_ENGINES)
 
-    def draw(self, context):
+    def draw(self, _context):
         return  # do nothing.
 
 
@@ -653,7 +653,7 @@ class PHYSICS_PT_dp_effects_drip_weights(PhysicButtonsPanel, Panel):
 
         layout.active = surface.use_drip
 
-        effector_weights_ui(self, context, surface.effector_weights, 'DYNAMIC_PAINT')
+        effector_weights_ui(self, surface.effector_weights, 'DYNAMIC_PAINT')
 
 
 class PHYSICS_PT_dp_effects_shrink(PhysicButtonsPanel, Panel):
@@ -704,7 +704,7 @@ class PHYSICS_PT_dp_cache(PhysicButtonsPanel, Panel):
         surface = context.dynamic_paint.canvas_settings.canvas_surfaces.active
         cache = surface.point_cache
 
-        point_cache_ui(self, context, cache, (cache.is_baked is False), 'DYNAMIC_PAINT')
+        point_cache_ui(self, cache, (cache.is_baked is False), 'DYNAMIC_PAINT')
 
 
 class PHYSICS_PT_dp_brush_source(PhysicButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_physics_field.py b/release/scripts/startup/bl_ui/properties_physics_field.py
index 7123d33a86b..1b8c3667f2f 100644
--- a/release/scripts/startup/bl_ui/properties_physics_field.py
+++ b/release/scripts/startup/bl_ui/properties_physics_field.py
@@ -131,7 +131,7 @@ class PHYSICS_PT_field_settings(PhysicButtonsPanel, Panel):
             col.prop(field, "use_smoke_density")
         else:
             del flow
-            basic_force_field_settings_ui(self, context, field)
+            basic_force_field_settings_ui(self, field)
 
 
 class PHYSICS_PT_field_settings_kink(PhysicButtonsPanel, Panel):
@@ -212,7 +212,7 @@ class PHYSICS_PT_field_falloff(PhysicButtonsPanel, Panel):
 
         layout.prop(field, "falloff_type", text="Shape")
 
-        basic_force_field_falloff_ui(self, context, field)
+        basic_force_field_falloff_ui(self, field)
 
 
 class PHYSICS_PT_field_falloff_angular(PhysicButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index 17289cfbaf1..b01d806630c 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -367,7 +367,7 @@ class PHYSICS_PT_domain_viscosity(PhysicButtonsPanel, Panel):
 
         return (context.engine in cls.COMPAT_ENGINES)
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         FLUID_PT_presets.draw_panel_header(self.layout)
 
     def draw(self, context):
diff --git a/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py b/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
index 02f0dc6ea08..ec35e1230d8 100644
--- a/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
+++ b/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
@@ -139,7 +139,7 @@ class PHYSICS_PT_rigid_body_constraint_limits(PHYSICS_PT_rigidbody_constraint_pa
         return (ob and rbc and (rbc.type in {'GENERIC', 'GENERIC_SPRING', 'HINGE', 'SLIDER', 'PISTON'})
                 and context.engine in cls.COMPAT_ENGINES)
 
-    def draw(self, context):
+    def draw(self, _context):
         return  # do nothing.
 
 
@@ -279,7 +279,7 @@ class PHYSICS_PT_rigid_body_constraint_motor(PHYSICS_PT_rigidbody_constraint_pan
         return (ob and rbc and rbc.type == 'MOTOR'
                 and context.engine in cls.COMPAT_ENGINES)
 
-    def draw(self, context):
+    def draw(self, _context):
         return  # do nothing.
 
 
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index 9d170d07c69..7770db7105e 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -540,7 +540,7 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel, Panel):
             col.separator()
 
         cache = domain.point_cache
-        point_cache_ui(self, context, cache, (cache.is_baked is False), 'SMOKE')
+        point_cache_ui(self, cache, (cache.is_baked is False), 'SMOKE')
 
 
 class PHYSICS_PT_smoke_field_weights(PhysicButtonsPanel, Panel):
@@ -558,7 +558,7 @@ class PHYSICS_PT_smoke_field_weights(PhysicButtonsPanel, Panel):
 
     def draw(self, context):
         domain = context.smoke.domain_settings
-        effector_weights_ui(self, context, domain.effector_weights, 'SMOKE')
+        effector_weights_ui(self, domain.effector_weights, 'SMOKE')
 
 
 class PHYSICS_PT_smoke_viewport_display(PhysicButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_physics_softbody.py b/release/scripts/startup/bl_ui/properties_physics_softbody.py
index 462797ad597..6157446fd5a 100644
--- a/release/scripts/startup/bl_ui/properties_physics_softbody.py
+++ b/release/scripts/startup/bl_ui/properties_physics_softbody.py
@@ -112,7 +112,7 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel, Panel):
 
     def draw(self, context):
         md = context.soft_body
-        point_cache_ui(self, context, md.point_cache, softbody_panel_enabled(md), 'SOFTBODY')
+        point_cache_ui(self, md.point_cache, softbody_panel_enabled(md), 'SOFTBODY')
 
 
 class PHYSICS_PT_softbody_goal(PhysicButtonsPanel, Panel):
@@ -395,7 +395,7 @@ class PHYSICS_PT_softbody_field_weights(PhysicButtonsPanel, Panel):
         md = context.soft_body
         softbody = md.settings
 
-        effector_weights_ui(self, context, softbody.effector_weights, 'SOFTBODY')
+        effector_weights_ui(self, softbody.effector_weights, 'SOFTBODY')
 
 
 classes = (
diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py
index 5687caa8be0..df431000048 100644
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -33,7 +33,7 @@ from .properties_physics_common import (
 
 
 class SCENE_UL_keying_set_paths(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
         # assert(isinstance(item, bpy.types.KeyingSetPath)
         kspath = item
         icon = layout.enum_item_icon(kspath, "id_type", kspath.id_type)
@@ -408,7 +408,7 @@ class SCENE_PT_rigid_body_cache(RigidBodySubPanel, Panel):
         scene = context.scene
         rbw = scene.rigidbody_world
 
-        point_cache_ui(self, context, rbw.point_cache, rbw.point_cache.is_baked is False and rbw.enabled, 'RIGID_BODY')
+        point_cache_ui(self, rbw.point_cache, rbw.point_cache.is_baked is False and rbw.enabled, 'RIGID_BODY')
 
 
 class SCENE_PT_rigid_body_field_weights(RigidBodySubPanel, Panel):
@@ -420,7 +420,7 @@ class SCENE_PT_rigid_body_field_weights(RigidBodySubPanel, Panel):
         scene = context.scene
         rbw = scene.rigidbody_world
 
-        effector_weights_ui(self, context, rbw.effector_weights, 'RIGID_BODY')
+        effector_weights_ui(self, rbw.effector_weights, 'RIGID_BODY')
 
 
 class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index 313e0668b92..946083ea4e9 100644
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -39,7 +39,7 @@ class TEXTURE_MT_context_menu(Menu):
     bl_label = "Texture Specials"
     COMPAT_ENGINES = {'BLENDER_RENDER'}
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("texture.slot_copy", icon='COPYDOWN')
@@ -48,7 +48,7 @@ class TEXTURE_MT_context_menu(Menu):
 
 class TEXTURE_UL_texslots(UIList):
 
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
         slot = item
         tex = slot.texture if slot else None
 
@@ -357,7 +357,7 @@ class TEXTURE_PT_image(TextureTypePanel, Panel):
     tex_type = 'IMAGE'
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
 
-    def draw(self, context):
+    def draw(self, _context):
         # TODO: maybe expose the template_ID from the template image here.
         layout = self.layout
         del layout
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index 28a6a61ab07..59e74f96862 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -29,8 +29,8 @@ from .properties_grease_pencil_common import (
 
 
 class CLIP_UL_tracking_objects(UIList):
-    def draw_item(self, context, layout, data, item, icon,
-                  active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, _icon,
+                  _active_data, _active_propname, _index):
         # assert(isinstance(item, bpy.types.MovieTrackingObject)
         tobj = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
@@ -364,7 +364,7 @@ class CLIP_PT_tools_clip(Panel):
 
         return clip and sc.view == 'CLIP' and sc.mode != 'MASK'
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         col = layout.column(align=True)
@@ -380,7 +380,7 @@ class CLIP_PT_tools_marker(CLIP_PT_tracking_panel, Panel):
     bl_label = "Marker"
     bl_category = "Track"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         col = layout.column(align=True)
@@ -396,7 +396,7 @@ class CLIP_PT_tracking_settings(CLIP_PT_tracking_panel, Panel):
     bl_label = "Tracking Settings"
     bl_category = "Track"
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         CLIP_PT_tracking_settings_presets.draw_panel_header(self.layout)
 
     def draw(self, context):
@@ -467,7 +467,7 @@ class CLIP_PT_tools_tracking(CLIP_PT_tracking_panel, Panel):
     bl_category = "Track"
     bl_options = {'DEFAULT_CLOSED'}
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         row = layout.row(align=True)
@@ -522,7 +522,7 @@ class CLIP_PT_tools_plane_tracking(CLIP_PT_tracking_panel, Panel):
     bl_options = {'DEFAULT_CLOSED'}
     bl_category = "Solve"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.operator("clip.create_plane_track")
 
@@ -598,7 +598,7 @@ class CLIP_PT_tools_geometry(CLIP_PT_tracking_panel, Panel):
     bl_options = {'DEFAULT_CLOSED'}
     bl_category = "Solve"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("clip.bundles_to_mesh")
@@ -862,7 +862,7 @@ class CLIP_PT_tracking_camera(Panel):
 
         return False
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         CLIP_PT_camera_presets.draw_panel_header(self.layout)
 
     def draw(self, context):
@@ -1198,7 +1198,7 @@ class CLIP_PT_tools_scenesetup(Panel):
 
         return clip and sc.view == 'CLIP' and sc.mode != 'MASK'
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("clip.set_viewport_background")
@@ -1292,7 +1292,7 @@ class CLIP_MT_clip(Menu):
 class CLIP_MT_proxy(Menu):
     bl_label = "Proxy"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("clip.rebuild_proxy")
@@ -1302,7 +1302,7 @@ class CLIP_MT_proxy(Menu):
 class CLIP_MT_track(Menu):
     bl_label = "Track"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("clip.clear_solution")
@@ -1363,7 +1363,7 @@ class CLIP_MT_track(Menu):
 class CLIP_MT_reconstruction(Menu):
     bl_label = "Reconstruction"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("clip.set_origin")
@@ -1384,7 +1384,7 @@ class CLIP_MT_reconstruction(Menu):
 class CLIP_MT_track_visibility(Menu):
     bl_label = "Show/Hide"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("clip.hide_tracks_clear")
@@ -1395,7 +1395,7 @@ class CLIP_MT_track_visibility(Menu):
 class CLIP_MT_track_transform(Menu):
     bl_label = "Transform"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("transform.translate")
@@ -1405,7 +1405,7 @@ class CLIP_MT_track_transform(Menu):
 class CLIP_MT_select(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("clip.select_box")
@@ -1424,7 +1424,7 @@ class CLIP_MT_select(Menu):
 class CLIP_MT_select_grouped(Menu):
     bl_label = "Select Grouped"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_enum("clip.select_grouped", "group")
@@ -1437,7 +1437,7 @@ class CLIP_MT_tracking_context_menu(Menu):
     def poll(cls, context):
         return context.space_data.clip
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("clip.disable_markers",
@@ -1487,7 +1487,7 @@ class CLIP_PT_tracking_settings_presets(PresetPanel, Panel):
 class CLIP_MT_stabilize_2d_context_menu(Menu):
     bl_label = "Translation Track Specials"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("clip.stabilize_2d_select")
@@ -1496,7 +1496,7 @@ class CLIP_MT_stabilize_2d_context_menu(Menu):
 class CLIP_MT_stabilize_2d_rotation_context_menu(Menu):
     bl_label = "Rotation Track Specials"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("clip.stabilize_2d_rotation_select")
diff --git a/release/scripts/startup/bl_ui/space_console.py b/release/scripts/startup/bl_ui/space_console.py
index 06349abaaf0..2e1d0fd2eba 100644
--- a/release/scripts/startup/bl_ui/space_console.py
+++ b/release/scripts/startup/bl_ui/space_console.py
@@ -38,7 +38,7 @@ class CONSOLE_MT_editor_menus(Menu):
     bl_idname = "CONSOLE_MT_editor_menus"
     bl_label = ""
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.menu("CONSOLE_MT_console")
 
@@ -46,7 +46,7 @@ class CONSOLE_MT_editor_menus(Menu):
 class CONSOLE_MT_console(Menu):
     bl_label = "Console"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("console.indent")
@@ -72,7 +72,7 @@ class CONSOLE_MT_console(Menu):
 class CONSOLE_MT_language(Menu):
     bl_label = "Languages..."
 
-    def draw(self, context):
+    def draw(self, _context):
         import sys
 
         layout = self.layout
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index d67ceacd3de..5905e0b37e4 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -431,7 +431,7 @@ class DOPESHEET_MT_marker(Menu):
 class DOPESHEET_MT_channel(Menu):
     bl_label = "Channel"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_REGION_CHANNELS'
@@ -465,7 +465,7 @@ class DOPESHEET_MT_channel(Menu):
 class DOPESHEET_MT_key(Menu):
     bl_label = "Key"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.menu("DOPESHEET_MT_key_transform", text="Transform")
@@ -500,7 +500,7 @@ class DOPESHEET_MT_key(Menu):
 class DOPESHEET_MT_key_transform(Menu):
     bl_label = "Transform"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("transform.transform", text="Move").mode = 'TIME_TRANSLATE'
@@ -515,7 +515,7 @@ class DOPESHEET_MT_key_transform(Menu):
 class DOPESHEET_MT_gpencil_channel(Menu):
     bl_label = "Channel"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_REGION_CHANNELS'
@@ -542,7 +542,7 @@ class DOPESHEET_MT_gpencil_channel(Menu):
 class DOPESHEET_MT_gpencil_frame(Menu):
     bl_label = "Frame"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.menu("DOPESHEET_MT_key_transform", text="Transform")
@@ -564,7 +564,7 @@ class DOPESHEET_MT_gpencil_frame(Menu):
 class DOPESHEET_MT_delete(Menu):
     bl_label = "Delete"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("action.delete")
@@ -578,7 +578,7 @@ class DOPESHEET_MT_delete(Menu):
 class DOPESHEET_MT_context_menu(Menu):
     bl_label = "Dope Sheet Context Menu"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("action.copy", text="Copy")
@@ -606,7 +606,7 @@ class DOPESHEET_MT_context_menu(Menu):
 class DOPESHEET_MT_channel_context_menu(Menu):
     bl_label = "Dope Sheet Channel Context Menu"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("anim.channels_setting_enable", text="Mute Channels").type = 'MUTE'
@@ -638,7 +638,7 @@ class DOPESHEET_MT_channel_context_menu(Menu):
 class DOPESHEET_MT_snap_pie(Menu):
     bl_label = "Snap"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         pie = layout.menu_pie()
 
diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py
index 5ab4dbfd16b..b3e7ca62ed1 100644
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@ -89,7 +89,7 @@ class FILEBROWSER_HT_header(Header):
 
 
 class FILEBROWSER_UL_dir(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, active_propname, _index):
         direntry = item
         # space = context.space_data
         icon = 'NONE'
@@ -155,7 +155,7 @@ class FILEBROWSER_PT_system_bookmarks(Panel):
 class FILEBROWSER_MT_bookmarks_context_menu(Menu):
     bl_label = "Bookmarks Specials"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.operator("file.bookmark_cleanup", icon='X', text="Cleanup")
 
diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py
index 2e7fb2e0083..eaa3d94babf 100644
--- a/release/scripts/startup/bl_ui/space_graph.py
+++ b/release/scripts/startup/bl_ui/space_graph.py
@@ -94,7 +94,7 @@ class GRAPH_MT_editor_menus(Menu):
     bl_idname = "GRAPH_MT_editor_menus"
     bl_label = ""
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.menu("GRAPH_MT_view")
         layout.menu("GRAPH_MT_select")
@@ -158,7 +158,7 @@ class GRAPH_MT_view(Menu):
 class GRAPH_MT_select(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("graph.select_all", text="All").action = 'SELECT'
@@ -258,7 +258,7 @@ class GRAPH_MT_channel(Menu):
 class GRAPH_MT_key(Menu):
     bl_label = "Key"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.menu("GRAPH_MT_key_transform", text="Transform")
@@ -300,7 +300,7 @@ class GRAPH_MT_key(Menu):
 class GRAPH_MT_key_transform(Menu):
     bl_label = "Transform"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("transform.translate", text="Move")
@@ -312,7 +312,7 @@ class GRAPH_MT_key_transform(Menu):
 class GRAPH_MT_delete(Menu):
     bl_label = "Delete"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("graph.delete")
@@ -326,7 +326,7 @@ class GRAPH_MT_delete(Menu):
 class GRAPH_MT_context_menu(Menu):
     bl_label = "F-Curve Context Menu"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("graph.copy", text="Copy")
@@ -366,7 +366,7 @@ class GRAPH_MT_pivot_pie(Menu):
 class GRAPH_MT_snap_pie(Menu):
     bl_label = "Snap"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         pie = layout.menu_pie()
 
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index ef360499535..81c411a06cb 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -120,7 +120,7 @@ class IMAGE_MT_view(Menu):
 class IMAGE_MT_view_zoom(Menu):
     bl_label = "Fractional Zoom"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         ratios = ((1, 8), (1, 4), (1, 2), (1, 1), (2, 1), (4, 1), (8, 1))
@@ -139,7 +139,7 @@ class IMAGE_MT_view_zoom(Menu):
 class IMAGE_MT_select(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("uv.select_all", text="All").action = 'SELECT'
@@ -238,7 +238,7 @@ class IMAGE_MT_image(Menu):
 class IMAGE_MT_image_invert(Menu):
     bl_label = "Invert"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         props = layout.operator("image.invert", text="Invert Image Colors", icon='IMAGE_RGB')
@@ -257,7 +257,7 @@ class IMAGE_MT_image_invert(Menu):
 class IMAGE_MT_uvs_showhide(Menu):
     bl_label = "Show/Hide Faces"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("uv.reveal")
@@ -282,7 +282,7 @@ class IMAGE_MT_uvs_proportional(Menu):
 class IMAGE_MT_uvs_transform(Menu):
     bl_label = "Transform"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("transform.translate")
@@ -297,7 +297,7 @@ class IMAGE_MT_uvs_transform(Menu):
 class IMAGE_MT_uvs_snap(Menu):
     bl_label = "Snap"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'EXEC_REGION_WIN'
@@ -316,7 +316,7 @@ class IMAGE_MT_uvs_snap(Menu):
 class IMAGE_MT_uvs_mirror(Menu):
     bl_label = "Mirror"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mesh.faces_mirror_uv")
@@ -332,7 +332,7 @@ class IMAGE_MT_uvs_mirror(Menu):
 class IMAGE_MT_uvs_weldalign(Menu):
     bl_label = "Weld/Align"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("uv.weld")  # W, 1.
@@ -492,7 +492,7 @@ class IMAGE_MT_pivot_pie(Menu):
 class IMAGE_MT_uvs_snap_pie(Menu):
     bl_label = "Snap"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         pie = layout.menu_pie()
 
@@ -589,7 +589,7 @@ class IMAGE_HT_tool_header(Header):
 
 class _draw_tool_settings_context_mode:
     @staticmethod
-    def VIEW(context, layout, tool):
+    def VIEW(context, layout, _tool):
         tool_settings = context.tool_settings
         if tool_settings.use_uv_sculpt:
             if context.mode == 'EDIT_MESH':
@@ -897,7 +897,7 @@ class IMAGE_PT_view_display_uv_edit_overlays_advanced(Panel):
 
 
 class IMAGE_UL_render_slots(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, _icon, _active_data, _active_propname, _index):
         slot = item
         layout.prop(slot, "name", text="", emboss=False)
 
diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py
index 3ce48291619..e22b0bfe345 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -23,7 +23,7 @@ from bpy.types import Header, Menu
 class INFO_HT_header(Header):
     bl_space_type = 'INFO'
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.template_header()
 
diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py
index a836fdf5d19..8c5c360de93 100644
--- a/release/scripts/startup/bl_ui/space_nla.py
+++ b/release/scripts/startup/bl_ui/space_nla.py
@@ -70,7 +70,7 @@ class NLA_MT_editor_menus(Menu):
     bl_idname = "NLA_MT_editor_menus"
     bl_label = ""
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.menu("NLA_MT_view")
         layout.menu("NLA_MT_select")
@@ -117,7 +117,7 @@ class NLA_MT_view(Menu):
 class NLA_MT_select(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("nla.select_all", text="All").action = 'SELECT'
@@ -199,7 +199,7 @@ class NLA_MT_edit(Menu):
 class NLA_MT_add(Menu):
     bl_label = "Add"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("nla.actionclip_add")
@@ -221,7 +221,7 @@ class NLA_MT_add(Menu):
 class NLA_MT_edit_transform(Menu):
     bl_label = "Transform"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("transform.translate", text="Move")
@@ -232,7 +232,7 @@ class NLA_MT_edit_transform(Menu):
 class NLA_MT_snap_pie(Menu):
     bl_label = "Snap"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         pie = layout.menu_pie()
 
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index 374ef912303..caab7938c3e 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -180,7 +180,7 @@ class NODE_MT_editor_menus(Menu):
     bl_idname = "NODE_MT_editor_menus"
     bl_label = ""
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.menu("NODE_MT_view")
         layout.menu("NODE_MT_select")
@@ -247,7 +247,7 @@ class NODE_MT_view(Menu):
 class NODE_MT_select(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("node.select_box").tweak = False
@@ -273,7 +273,7 @@ class NODE_MT_select(Menu):
 class NODE_MT_node(Menu):
     bl_label = "Node"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("transform.translate")
@@ -368,7 +368,7 @@ class NODE_PT_node_color_presets(PresetPanel, Panel):
 class NODE_MT_node_color_context_menu(Menu):
     bl_label = "Node Color Specials"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("node.node_copy_color", icon='COPY_ID')
@@ -460,7 +460,7 @@ class NODE_PT_active_node_color(Panel):
         node = context.active_node
         self.layout.prop(node, "use_custom_color", text="")
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         NODE_PT_node_color_presets.draw_panel_header(self.layout)
 
     def draw(self, context):
@@ -612,7 +612,7 @@ class NODE_PT_quality(bpy.types.Panel):
 
 
 class NODE_UL_interface_sockets(bpy.types.UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, context, layout, _data, item, icon, _active_data, _active_propname, _index):
         socket = item
         color = socket.draw_color(context)
 
@@ -660,7 +660,7 @@ class NODE_PT_grease_pencil_tools(GreasePencilToolsPanel, Panel):
     # toolbar, but which may not necessarily be open
 
 
-def node_draw_tree_view(layout, context):
+def node_draw_tree_view(_layout, _context):
     pass
 
 
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 9282d6a9150..6107542c123 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -100,7 +100,7 @@ class OUTLINER_MT_editor_menus(Menu):
 class OUTLINER_MT_context(Menu):
     bl_label = "Outliner"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.menu("OUTLINER_MT_context_view")
@@ -113,7 +113,7 @@ class OUTLINER_MT_context(Menu):
 class OUTLINER_MT_context_view(Menu):
     bl_label = "View"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("outliner.show_active")
@@ -128,7 +128,7 @@ class OUTLINER_MT_context_view(Menu):
 class OUTLINER_MT_edit_datablocks(Menu):
     bl_label = "Edit"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("outliner.keyingset_add_selected")
@@ -160,7 +160,7 @@ class OUTLINER_MT_collection_view_layer(Menu):
 class OUTLINER_MT_collection_visibility(Menu):
     bl_label = "Visibility"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("outliner.collection_isolate", text="Isolate")
diff --git a/release/scripts/startup/bl_ui/space_properties.py b/release/scripts/startup/bl_ui/space_properties.py
index 3febcce37c7..5cdcdaa0254 100644
--- a/release/scripts/startup/bl_ui/space_properties.py
+++ b/release/scripts/startup/bl_ui/space_properties.py
@@ -23,7 +23,7 @@ from bpy.types import Header, Panel
 class PROPERTIES_HT_header(Header):
     bl_space_type = 'PROPERTIES'
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         row = layout.row()
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index f8c628faf22..f47213c435d 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -152,7 +152,7 @@ class SEQUENCER_MT_editor_menus(Menu):
 class SEQUENCER_MT_view_toggle(Menu):
     bl_label = "View Type"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("sequencer.view_toggle").type = 'SEQUENCER'
@@ -238,7 +238,7 @@ class SEQUENCER_MT_view(Menu):
 class SEQUENCER_MT_select(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("sequencer.select_all", text="All").action = 'SELECT'
@@ -310,7 +310,7 @@ class SEQUENCER_MT_change(Menu):
 class SEQUENCER_MT_frame(Menu):
     bl_label = "Frame"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("anim.previewrange_clear")
@@ -400,7 +400,7 @@ class SEQUENCER_MT_add(Menu):
 class SEQUENCER_MT_add_empty(Menu):
     bl_label = "Empty"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.label(text="No Items Available")
@@ -461,7 +461,7 @@ class SEQUENCER_MT_add_effect(Menu):
 class SEQUENCER_MT_strip_transform(Menu):
     bl_label = "Transform"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("transform.transform", text="Move").mode = 'TRANSLATION'
@@ -502,7 +502,7 @@ class SEQUENCER_MT_strip_input(Menu):
 class SEQUENCER_MT_strip_lock_mute(Menu):
     bl_label = "Lock/Mute"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("sequencer.lock", icon='LOCKED')
diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py
index 917c700f027..3b5cc0ec652 100644
--- a/release/scripts/startup/bl_ui/space_text.py
+++ b/release/scripts/startup/bl_ui/space_text.py
@@ -236,7 +236,7 @@ class TEXT_MT_text(Menu):
 class TEXT_MT_templates_py(Menu):
     bl_label = "Python"
 
-    def draw(self, context):
+    def draw(self, _context):
         self.path_menu(
             bpy.utils.script_paths("templates_py"),
             "text.open",
@@ -247,7 +247,7 @@ class TEXT_MT_templates_py(Menu):
 class TEXT_MT_templates_osl(Menu):
     bl_label = "Open Shading Language"
 
-    def draw(self, context):
+    def draw(self, _context):
         self.path_menu(
             bpy.utils.script_paths("templates_osl"),
             "text.open",
@@ -258,7 +258,7 @@ class TEXT_MT_templates_osl(Menu):
 class TEXT_MT_templates(Menu):
     bl_label = "Templates"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.menu("TEXT_MT_templates_py")
         layout.menu("TEXT_MT_templates_osl")
@@ -267,7 +267,7 @@ class TEXT_MT_templates(Menu):
 class TEXT_MT_edit_select(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("text.select_all")
@@ -277,7 +277,7 @@ class TEXT_MT_edit_select(Menu):
 class TEXT_MT_format(Menu):
     bl_label = "Format"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("text.indent")
@@ -296,7 +296,7 @@ class TEXT_MT_format(Menu):
 class TEXT_MT_edit_to3d(Menu):
     bl_label = "Text To 3D Object"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("text.to_3d_object",
@@ -314,7 +314,7 @@ class TEXT_MT_edit(Menu):
     def poll(cls, context):
         return (context.space_data.text)
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("ed.undo")
@@ -352,7 +352,7 @@ class TEXT_MT_edit(Menu):
 class TEXT_MT_toolbox(Menu):
     bl_label = ""
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_DEFAULT'
diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py
index 75f020666bb..5c7f2c1b47f 100644
--- a/release/scripts/startup/bl_ui/space_time.py
+++ b/release/scripts/startup/bl_ui/space_time.py
@@ -85,7 +85,7 @@ class TIME_MT_editor_menus(Menu):
     bl_idname = "TIME_MT_editor_menus"
     bl_label = ""
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         horizontal = (layout.direction == 'VERTICAL')
         if horizontal:
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index f1eb53f2702..39a5db6aa88 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -44,7 +44,7 @@ def kmi_to_string_or_none(kmi):
 
 
 def generate_from_enum_ex(
-        context, *,
+        _context, *,
         idname_prefix,
         icon_prefix,
         type,
@@ -73,7 +73,7 @@ def generate_from_enum_ex(
 class _template_widget:
     class VIEW3D_GGT_xform_extrude:
         @staticmethod
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.gizmo_group_properties("VIEW3D_GGT_xform_extrude")
             layout.prop(props, "axis_type", expand=True)
 
@@ -88,7 +88,7 @@ class _template_widget:
 class _defs_view3d_generic:
     @ToolDef.from_fn
     def cursor():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("view3d.cursor3d")
             layout.prop(props, "use_depth")
             layout.prop(props, "orientation")
@@ -114,7 +114,7 @@ class _defs_view3d_generic:
 
     @ToolDef.from_fn
     def ruler():
-        def description(context, item, km):
+        def description(_context, _item, km):
             if km is not None:
                 kmi_add = km.keymap_items.find_from_operator("view3d.ruler_add")
                 kmi_remove = km.keymap_items.find_from_operator("view3d.ruler_remove")
@@ -218,7 +218,7 @@ class _defs_annotate:
 
     @ToolDef.from_fn
     def eraser():
-        def draw_settings(context, layout, tool):
+        def draw_settings(context, layout, _tool):
             # TODO: Move this setting to tool_settings
             prefs = context.preferences
             layout.prop(prefs.edit, "grease_pencil_eraser_radius", text="Radius")
@@ -236,7 +236,7 @@ class _defs_transform:
 
     @ToolDef.from_fn
     def translate():
-        def draw_settings(context, layout, tool):
+        def draw_settings(context, layout, _tool):
             _template_widget.VIEW3D_GGT_xform_gizmo.draw_settings_with_index(context, layout, 1)
         return dict(
             idname="builtin.move",
@@ -251,7 +251,7 @@ class _defs_transform:
 
     @ToolDef.from_fn
     def rotate():
-        def draw_settings(context, layout, tool):
+        def draw_settings(context, layout, _tool):
             _template_widget.VIEW3D_GGT_xform_gizmo.draw_settings_with_index(context, layout, 2)
         return dict(
             idname="builtin.rotate",
@@ -266,7 +266,7 @@ class _defs_transform:
 
     @ToolDef.from_fn
     def scale():
-        def draw_settings(context, layout, tool):
+        def draw_settings(context, layout, _tool):
             _template_widget.VIEW3D_GGT_xform_gizmo.draw_settings_with_index(context, layout, 3)
         return dict(
             idname="builtin.scale",
@@ -281,7 +281,7 @@ class _defs_transform:
 
     @ToolDef.from_fn
     def scale_cage():
-        def draw_settings(context, layout, tool):
+        def draw_settings(context, layout, _tool):
             _template_widget.VIEW3D_GGT_xform_gizmo.draw_settings_with_index(context, layout, 3)
         return dict(
             idname="builtin.scale_cage",
@@ -298,7 +298,7 @@ class _defs_view3d_select:
 
     @ToolDef.from_fn
     def select():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, _layout, _tool):
             pass
         return dict(
             idname="builtin.select",
@@ -311,7 +311,7 @@ class _defs_view3d_select:
 
     @ToolDef.from_fn
     def box():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("view3d.select_box")
             layout.prop(props, "mode", text="")
         return dict(
@@ -325,7 +325,7 @@ class _defs_view3d_select:
 
     @ToolDef.from_fn
     def lasso():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("view3d.select_lasso")
             layout.prop(props, "mode", text="")
         return dict(
@@ -339,12 +339,12 @@ class _defs_view3d_select:
 
     @ToolDef.from_fn
     def circle():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("view3d.select_circle")
             layout.prop(props, "mode", text="")
             layout.prop(props, "radius")
 
-        def draw_cursor(context, tool, xy):
+        def draw_cursor(_context, tool, xy):
             from gpu_extras.presets import draw_circle_2d
             props = tool.operator_properties("view3d.select_circle")
             radius = props.radius
@@ -436,7 +436,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def rip_region():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("mesh.rip_move")
             props_macro = props.MESH_OT_rip
             layout.prop(props_macro, "use_fill")
@@ -472,7 +472,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def edge_slide():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("transform.edge_slide")
             layout.prop(props, "correct_uv")
 
@@ -487,7 +487,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def vert_slide():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("transform.vert_slide")
             layout.prop(props, "correct_uv")
 
@@ -502,7 +502,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def spin():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("mesh.spin")
             layout.prop(props, "steps")
             props = tool.gizmo_group_properties("MESH_GGT_spin")
@@ -519,7 +519,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def spin_duplicate():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("mesh.spin")
             layout.prop(props, "steps")
             props = tool.gizmo_group_properties("MESH_GGT_spin")
@@ -536,7 +536,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def inset():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("mesh.inset")
             layout.prop(props, "use_outset")
             layout.prop(props, "use_individual")
@@ -554,7 +554,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def bevel():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("mesh.bevel")
             layout.prop(props, "offset_type")
             layout.prop(props, "segments")
@@ -589,7 +589,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def extrude_normals():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("mesh.extrude_region_shrink_fatten")
             props_macro = props.TRANSFORM_OT_shrink_fatten
             layout.prop(props_macro, "use_even_offset")
@@ -615,7 +615,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def extrude_cursor():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("mesh.dupli_extrude_cursor")
             layout.prop(props, "rotate_source")
 
@@ -631,7 +631,7 @@ class _defs_edit_mesh:
     @ToolDef.from_fn
     def loopcut_slide():
 
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("mesh.loopcut_slide")
             props_macro = props.MESH_OT_loopcut
             layout.prop(props_macro, "number_cuts")
@@ -659,7 +659,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def vertex_smooth():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("mesh.vertices_smooth")
             layout.prop(props, "repeat")
         return dict(
@@ -673,7 +673,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def vertex_randomize():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("transform.vertex_random")
             layout.prop(props, "uniform")
             layout.prop(props, "normal")
@@ -715,7 +715,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def shrink_fatten():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("transform.shrink_fatten")
             layout.prop(props, "use_even_offset")
 
@@ -740,7 +740,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def knife():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("mesh.knife_tool")
             layout.prop(props, "use_occlude_geometry")
             layout.prop(props, "only_selected")
@@ -756,7 +756,7 @@ class _defs_edit_mesh:
 
     @ToolDef.from_fn
     def bisect():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("mesh.bisect")
             layout.prop(props, "use_fill")
             layout.prop(props, "clear_inner")
@@ -776,7 +776,7 @@ class _defs_edit_curve:
 
     @ToolDef.from_fn
     def draw():
-        def draw_settings(context, layout, tool):
+        def draw_settings(context, layout, _tool):
             # Tool settings initialize operator options.
             tool_settings = context.tool_settings
             cps = tool_settings.curve_paint_settings
@@ -850,7 +850,7 @@ class _defs_edit_curve:
 
     @ToolDef.from_fn
     def curve_vertex_randomize():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("transform.vertex_random")
             layout.prop(props, "uniform")
             layout.prop(props, "normal")
@@ -1078,7 +1078,7 @@ class _defs_image_generic:
     # Falls back to default image editor action.
     @ToolDef.from_fn
     def sample():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("image.sample")
             layout.prop(props, "size")
         return dict(
@@ -1113,7 +1113,7 @@ class _defs_image_uv_select:
 
     @ToolDef.from_fn
     def select():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, _layout, _tool):
             pass
         return dict(
             idname="builtin.select",
@@ -1126,7 +1126,7 @@ class _defs_image_uv_select:
 
     @ToolDef.from_fn
     def box():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("uv.select_box")
             layout.prop(props, "mode", text="")
         return dict(
@@ -1140,7 +1140,7 @@ class _defs_image_uv_select:
 
     @ToolDef.from_fn
     def lasso():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("uv.select_lasso")
             layout.prop(props, "mode", text="")
         return dict(
@@ -1154,7 +1154,7 @@ class _defs_image_uv_select:
 
     @ToolDef.from_fn
     def circle():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("uv.select_circle")
             layout.prop(props, "mode", text="")
             layout.prop(props, "radius")
@@ -1276,7 +1276,7 @@ class _defs_gpencil_edit:
 
     @ToolDef.from_fn
     def select():
-        def draw_settings(context, layout, tool):
+        def draw_settings(context, layout, _tool):
             layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
         return dict(
             idname="builtin.select",
@@ -1409,7 +1409,7 @@ class _defs_node_select:
 
     @ToolDef.from_fn
     def select():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, _layout, _tool):
             pass
         return dict(
             idname="builtin.select",
@@ -1422,7 +1422,7 @@ class _defs_node_select:
 
     @ToolDef.from_fn
     def box():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("node.select_box")
             layout.prop(props, "mode", text="")
             pass
@@ -1437,7 +1437,7 @@ class _defs_node_select:
 
     @ToolDef.from_fn
     def lasso():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("node.select_lasso")
             layout.prop(props, "mode", text="")
         return dict(
@@ -1451,7 +1451,7 @@ class _defs_node_select:
 
     @ToolDef.from_fn
     def circle():
-        def draw_settings(context, layout, tool):
+        def draw_settings(_context, layout, tool):
             props = tool.operator_properties("node.select_circle")
             layout.prop(props, "mode", text="")
             layout.prop(props, "radius")
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 04908eeb996..fad1fafa523 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -156,7 +156,7 @@ class TOPBAR_MT_editor_menus(Menu):
     bl_idname = "TOPBAR_MT_editor_menus"
     bl_label = ""
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.menu("TOPBAR_MT_file")
         layout.menu("TOPBAR_MT_edit")
@@ -260,7 +260,7 @@ class TOPBAR_MT_file_new(Menu):
 
         return sorted(app_templates)
 
-    def draw_ex(layout, context, *, use_splash=False, use_more=False):
+    def draw_ex(layout, _context, *, use_splash=False, use_more=False):
         layout.operator_context = 'EXEC_DEFAULT'
 
         # Limit number of templates in splash screen, spill over into more menu.
@@ -311,7 +311,7 @@ class TOPBAR_MT_file_import(Menu):
     bl_idname = "TOPBAR_MT_file_import"
     bl_label = "Import"
 
-    def draw(self, context):
+    def draw(self, _context):
         if bpy.app.build_options.collada:
             self.layout.operator("wm.collada_import", text="Collada (Default) (.dae)")
         if bpy.app.build_options.alembic:
@@ -322,7 +322,7 @@ class TOPBAR_MT_file_export(Menu):
     bl_idname = "TOPBAR_MT_file_export"
     bl_label = "Export"
 
-    def draw(self, context):
+    def draw(self, _context):
         if bpy.app.build_options.collada:
             self.layout.operator("wm.collada_export", text="Collada (Default) (.dae)")
         if bpy.app.build_options.alembic:
@@ -332,7 +332,7 @@ class TOPBAR_MT_file_export(Menu):
 class TOPBAR_MT_file_external_data(Menu):
     bl_label = "External Data"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         icon = 'CHECKBOX_HLT' if bpy.data.use_autopack else 'CHECKBOX_DEHLT'
@@ -359,7 +359,7 @@ class TOPBAR_MT_file_external_data(Menu):
 class TOPBAR_MT_file_previews(Menu):
     bl_label = "Data Previews"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("wm.previews_ensure")
@@ -552,7 +552,7 @@ class TOPBAR_MT_help(Menu):
 class TOPBAR_MT_file_context_menu(Menu):
     bl_label = "File Context Menu"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_AREA'
@@ -577,7 +577,7 @@ class TOPBAR_MT_file_context_menu(Menu):
 class TOPBAR_MT_workspace_menu(Menu):
     bl_label = "Workspace"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("workspace.duplicate", text="Duplicate", icon='DUPLICATE')
@@ -664,7 +664,7 @@ class TOPBAR_PT_name(Panel):
     bl_ui_units_x = 14
 
     @classmethod
-    def poll(cls, context):
+    def poll(cls, _context):
         return True
 
     def draw(self, context):
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 1740731c301..a85221323f1 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1157,7 +1157,7 @@ class FilePathsPanel:
 class USERPREF_PT_file_paths_data(FilePathsPanel, Panel):
     bl_label = "Data"
 
-    def draw_props(self, context, layout):
+    def draw_props(self, context, _layout):
         paths = context.preferences.filepaths
 
         col = self.layout.column()
@@ -1171,7 +1171,7 @@ class USERPREF_PT_file_paths_data(FilePathsPanel, Panel):
 class USERPREF_PT_file_paths_render(FilePathsPanel, Panel):
     bl_label = "Render"
 
-    def draw_props(self, context, layout):
+    def draw_props(self, context, _layout):
         paths = context.preferences.filepaths
 
         col = self.layout.column()
@@ -1924,7 +1924,7 @@ class USERPREF_PT_studiolight_matcaps(Panel, StudioLightPanelMixin):
     bl_label = "MatCaps"
     sl_type = 'MATCAP'
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         layout = self.layout
         layout.operator("preferences.studiolight_install", icon='IMPORT', text="Install...").type = 'MATCAP'
         layout.separator()
@@ -1934,7 +1934,7 @@ class USERPREF_PT_studiolight_world(Panel, StudioLightPanelMixin):
     bl_label = "LookDev HDRIs"
     sl_type = 'WORLD'
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         layout = self.layout
         layout.operator("preferences.studiolight_install", icon='IMPORT', text="Install...").type = 'WORLD'
         layout.separator()
@@ -1944,7 +1944,7 @@ class USERPREF_PT_studiolight_lights(Panel, StudioLightPanelMixin):
     bl_label = "Studio Lights"
     sl_type = 'STUDIO'
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         layout = self.layout
         op = layout.operator("preferences.studiolight_install", icon='IMPORT', text="Install...")
         op.type = 'STUDIO'
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 6cdc7dd725c..ecb629fb99e 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -734,7 +734,7 @@ class ShowHideMenu:
     bl_label = "Show/Hide"
     _operator_name = ""
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("%s.reveal" % self._operator_name)
@@ -849,7 +849,7 @@ class VIEW3D_MT_transform_armature(VIEW3D_MT_transform_base):
 class VIEW3D_MT_mirror(Menu):
     bl_label = "Mirror"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("transform.mirror", text="Interactive Mirror")
@@ -871,7 +871,7 @@ class VIEW3D_MT_mirror(Menu):
 class VIEW3D_MT_snap(Menu):
     bl_label = "Snap"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("view3d.snap_selected_to_grid", text="Selection to Grid")
@@ -890,7 +890,7 @@ class VIEW3D_MT_snap(Menu):
 class VIEW3D_MT_uv_map(Menu):
     bl_label = "UV Mapping"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("uv.unwrap")
@@ -978,7 +978,7 @@ class VIEW3D_MT_view(Menu):
 class VIEW3D_MT_view_local(Menu):
     bl_label = "Local View"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("view3d.localview", text="Toggle Local View")
@@ -988,7 +988,7 @@ class VIEW3D_MT_view_local(Menu):
 class VIEW3D_MT_view_cameras(Menu):
     bl_label = "Cameras"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("view3d.object_as_camera")
@@ -998,7 +998,7 @@ class VIEW3D_MT_view_cameras(Menu):
 class VIEW3D_MT_view_viewpoint(Menu):
     bl_label = "Viewpoint"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("view3d.view_camera", text="Camera")
@@ -1022,7 +1022,7 @@ class VIEW3D_MT_view_viewpoint(Menu):
 class VIEW3D_MT_view_navigation(Menu):
     bl_label = "Navigation"
 
-    def draw(self, context):
+    def draw(self, _context):
         from math import pi
         layout = self.layout
 
@@ -1056,7 +1056,7 @@ class VIEW3D_MT_view_navigation(Menu):
 class VIEW3D_MT_view_align(Menu):
     bl_label = "Align View"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.menu("VIEW3D_MT_view_align_selected")
@@ -1080,7 +1080,7 @@ class VIEW3D_MT_view_align(Menu):
 class VIEW3D_MT_view_align_selected(Menu):
     bl_label = "Align View to Active"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         props = layout.operator("view3d.view_axis", text="Top")
@@ -1115,7 +1115,7 @@ class VIEW3D_MT_view_align_selected(Menu):
 class VIEW3D_MT_view_regions(Menu):
     bl_label = "View Regions"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.operator("view3d.clip_border", text="Clipping Region...")
         layout.operator("view3d.render_border", text="Render Region...")
@@ -1130,7 +1130,7 @@ class VIEW3D_MT_view_regions(Menu):
 class VIEW3D_MT_select_object_more_less(Menu):
     bl_label = "Select More/Less"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout = self.layout
@@ -1162,7 +1162,7 @@ class VIEW3D_MT_select_object_more_less(Menu):
 class VIEW3D_MT_select_object(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("object.select_all", text="All").action = 'SELECT'
@@ -1195,7 +1195,7 @@ class VIEW3D_MT_select_object(Menu):
 class VIEW3D_MT_select_pose_more_less(Menu):
     bl_label = "Select More/Less"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout = self.layout
@@ -1222,7 +1222,7 @@ class VIEW3D_MT_select_pose_more_less(Menu):
 class VIEW3D_MT_select_pose(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("pose.select_all", text="All").action = 'SELECT'
@@ -1256,7 +1256,7 @@ class VIEW3D_MT_select_pose(Menu):
 class VIEW3D_MT_select_particle(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("particle.select_all", text="All").action = 'SELECT'
@@ -1290,7 +1290,7 @@ class VIEW3D_MT_select_particle(Menu):
 class VIEW3D_MT_edit_mesh_select_similar(Menu):
     bl_label = "Select Similar"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_enum("mesh.select_similar", "type")
@@ -1320,7 +1320,7 @@ class VIEW3D_MT_edit_mesh_select_by_trait(Menu):
 class VIEW3D_MT_edit_mesh_select_more_less(Menu):
     bl_label = "Select More/Less"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mesh.select_more", text="More")
@@ -1335,7 +1335,7 @@ class VIEW3D_MT_edit_mesh_select_more_less(Menu):
 class VIEW3D_MT_edit_mesh_select_linked(Menu):
     bl_label = "Select Linked"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mesh.select_linked", text="Linked")
@@ -1346,7 +1346,7 @@ class VIEW3D_MT_edit_mesh_select_linked(Menu):
 class VIEW3D_MT_edit_mesh_select_loops(Menu):
     bl_label = "Select Loops"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mesh.loop_multi_select", text="Edge Loops").ring = False
@@ -1361,7 +1361,7 @@ class VIEW3D_MT_edit_mesh_select_loops(Menu):
 class VIEW3D_MT_select_edit_mesh(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         # primitive
@@ -1415,7 +1415,7 @@ class VIEW3D_MT_select_edit_mesh(Menu):
 class VIEW3D_MT_select_edit_curve(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("curve.select_all", text="All").action = 'SELECT'
@@ -1450,7 +1450,7 @@ class VIEW3D_MT_select_edit_curve(Menu):
 class VIEW3D_MT_select_edit_surface(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("curve.select_all", text="All").action = 'SELECT'
@@ -1482,7 +1482,7 @@ class VIEW3D_MT_select_edit_surface(Menu):
 class VIEW3D_MT_edit_text_context_menu(Menu):
     bl_label = "Text Context Menu"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout = self.layout
@@ -1507,7 +1507,7 @@ class VIEW3D_MT_select_edit_text(Menu):
     # select menu for 3d-text doesn't make sense
     bl_label = "Edit"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("font.text_cut", text="Cut")
@@ -1528,7 +1528,7 @@ class VIEW3D_MT_select_edit_text(Menu):
 class VIEW3D_MT_select_edit_metaball(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mball.select_all", text="All").action = 'SELECT'
@@ -1552,7 +1552,7 @@ class VIEW3D_MT_select_edit_metaball(Menu):
 class VIEW3D_MT_edit_lattice_context_menu(Menu):
     bl_label = "Lattice Context Menu"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout = self.layout
@@ -1569,7 +1569,7 @@ class VIEW3D_MT_edit_lattice_context_menu(Menu):
 class VIEW3D_MT_select_edit_lattice(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("lattice.select_all", text="All").action = 'SELECT'
@@ -1599,7 +1599,7 @@ class VIEW3D_MT_select_edit_lattice(Menu):
 class VIEW3D_MT_select_edit_armature(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("armature.select_all", text="All").action = 'SELECT'
@@ -1647,7 +1647,7 @@ class VIEW3D_MT_select_edit_armature(Menu):
 class VIEW3D_MT_select_gpencil(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("gpencil.select_all", text="All").action = 'SELECT'
@@ -1679,7 +1679,7 @@ class VIEW3D_MT_select_gpencil(Menu):
 class VIEW3D_MT_select_paint_mask(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("paint.face_select_all", text="All").action = 'SELECT'
@@ -1699,7 +1699,7 @@ class VIEW3D_MT_select_paint_mask(Menu):
 class VIEW3D_MT_select_paint_mask_vertex(Menu):
     bl_label = "Select"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("paint.vert_select_all", text="All").action = 'SELECT'
@@ -1754,7 +1754,7 @@ class VIEW3D_MT_mesh_add(Menu):
     bl_idname = "VIEW3D_MT_mesh_add"
     bl_label = "Mesh"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_REGION_WIN'
@@ -1778,7 +1778,7 @@ class VIEW3D_MT_curve_add(Menu):
     bl_idname = "VIEW3D_MT_curve_add"
     bl_label = "Curve"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_REGION_WIN'
@@ -1797,7 +1797,7 @@ class VIEW3D_MT_surface_add(Menu):
     bl_idname = "VIEW3D_MT_surface_add"
     bl_label = "Surface"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_REGION_WIN'
@@ -1814,7 +1814,7 @@ class VIEW3D_MT_surface_add(Menu):
 class VIEW3D_MT_edit_metaball_context_menu(Menu):
     bl_label = "Metaball Context Menu"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_REGION_WIN'
@@ -1839,7 +1839,7 @@ class VIEW3D_MT_metaball_add(Menu):
     bl_idname = "VIEW3D_MT_metaball_add"
     bl_label = "Metaball"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_REGION_WIN'
@@ -1866,7 +1866,7 @@ class TOPBAR_MT_edit_armature_add(Menu):
     bl_idname = "TOPBAR_MT_edit_armature_add"
     bl_label = "Armature"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'EXEC_REGION_WIN'
@@ -1877,7 +1877,7 @@ class VIEW3D_MT_armature_add(Menu):
     bl_idname = "VIEW3D_MT_armature_add"
     bl_label = "Armature"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'EXEC_REGION_WIN'
@@ -1888,7 +1888,7 @@ class VIEW3D_MT_light_add(Menu):
     bl_idname = "VIEW3D_MT_light_add"
     bl_label = "Light"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_REGION_WIN'
@@ -1899,7 +1899,7 @@ class VIEW3D_MT_lightprobe_add(Menu):
     bl_idname = "VIEW3D_MT_lightprobe_add"
     bl_label = "Light Probe"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_REGION_WIN'
@@ -1910,7 +1910,7 @@ class VIEW3D_MT_camera_add(Menu):
     bl_idname = "VIEW3D_MT_camera_add"
     bl_label = "Camera"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.operator_context = 'EXEC_REGION_WIN'
         layout.operator("object.camera_add", text="Camera", icon='OUTLINER_OB_CAMERA')
@@ -1998,7 +1998,7 @@ class VIEW3D_MT_add(Menu):
 class VIEW3D_MT_image_add(Menu):
     bl_label = "Add Image"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.operator("object.load_reference_image", text="Reference", icon='IMAGE_REFERENCE')
         layout.operator("object.load_background_image", text="Background", icon='IMAGE_BACKGROUND')
@@ -2007,7 +2007,7 @@ class VIEW3D_MT_image_add(Menu):
 class VIEW3D_MT_object_relations(Menu):
     bl_label = "Relations"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("object.proxy_make", text="Make Proxy...")
@@ -2095,7 +2095,7 @@ class VIEW3D_MT_object(Menu):
 class VIEW3D_MT_object_animation(Menu):
     bl_label = "Animation"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("anim.keyframe_insert_menu", text="Insert Keyframe...")
@@ -2111,7 +2111,7 @@ class VIEW3D_MT_object_animation(Menu):
 class VIEW3D_MT_object_rigid_body(Menu):
     bl_label = "Rigid Body"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("rigidbody.objects_add", text="Add Active").type = 'ACTIVE'
@@ -2137,7 +2137,7 @@ class VIEW3D_MT_object_rigid_body(Menu):
 class VIEW3D_MT_object_clear(Menu):
     bl_label = "Clear"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("object.location_clear", text="Location").clear_delta = False
@@ -2371,7 +2371,7 @@ class VIEW3D_MT_object_shading(Menu):
     # XXX, this menu is a place to store shading operator in object mode
     bl_label = "Shading"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.operator("object.shade_smooth", text="Smooth")
         layout.operator("object.shade_flat", text="Flat")
@@ -2380,7 +2380,7 @@ class VIEW3D_MT_object_shading(Menu):
 class VIEW3D_MT_object_apply(Menu):
     bl_label = "Apply"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         props = layout.operator("object.transform_apply", text="Location", text_ctxt=i18n_contexts.default)
@@ -2441,7 +2441,7 @@ class VIEW3D_MT_object_apply(Menu):
 class VIEW3D_MT_object_parent(Menu):
     bl_label = "Parent"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_enum("object.parent_set", "type")
@@ -2454,7 +2454,7 @@ class VIEW3D_MT_object_parent(Menu):
 class VIEW3D_MT_object_track(Menu):
     bl_label = "Track"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_enum("object.track_set", "type")
@@ -2467,7 +2467,7 @@ class VIEW3D_MT_object_track(Menu):
 class VIEW3D_MT_object_collection(Menu):
     bl_label = "Collection"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("object.move_to_collection")
@@ -2489,7 +2489,7 @@ class VIEW3D_MT_object_collection(Menu):
 class VIEW3D_MT_object_constraints(Menu):
     bl_label = "Constraints"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("object.constraint_add_with_targets")
@@ -2503,7 +2503,7 @@ class VIEW3D_MT_object_constraints(Menu):
 class VIEW3D_MT_object_quick_effects(Menu):
     bl_label = "Quick Effects"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("object.quick_fur")
@@ -2515,7 +2515,7 @@ class VIEW3D_MT_object_quick_effects(Menu):
 class VIEW3D_MT_object_showhide(Menu):
     bl_label = "Show/Hide"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("object.hide_view_clear")
@@ -2529,7 +2529,7 @@ class VIEW3D_MT_object_showhide(Menu):
 class VIEW3D_MT_make_single_user(Menu):
     bl_label = "Make Single User"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         props = layout.operator("object.make_single_user", text="Object")
@@ -2556,7 +2556,7 @@ class VIEW3D_MT_make_single_user(Menu):
 class VIEW3D_MT_make_links(Menu):
     bl_label = "Make Links"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         operator_context_default = layout.operator_context
 
@@ -2652,7 +2652,7 @@ class VIEW3D_MT_brush_paint_modes(Menu):
 class VIEW3D_MT_paint_vertex(Menu):
     bl_label = "Paint"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("paint.vertex_color_set")
@@ -2761,7 +2761,7 @@ class VIEW3D_MT_paint_weight(Menu):
 
             layout.operator("paint.weight_set")
 
-    def draw(self, context):
+    def draw(self, _context):
         self.draw_generic(self.layout, is_editmode=False)
 
 
@@ -2801,7 +2801,7 @@ class VIEW3D_MT_sculpt(Menu):
 class VIEW3D_MT_hide_mask(Menu):
     bl_label = "Hide/Mask"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         props = layout.operator("paint.hide_show", text="Show All")
@@ -2930,7 +2930,7 @@ class VIEW3D_MT_particle_showhide(ShowHideMenu, Menu):
 class VIEW3D_MT_pose(Menu):
     bl_label = "Pose"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.menu("VIEW3D_MT_transform_armature")
@@ -2993,7 +2993,7 @@ class VIEW3D_MT_pose(Menu):
 class VIEW3D_MT_pose_transform(Menu):
     bl_label = "Clear Transform"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("pose.transforms_clear", text="All")
@@ -3012,7 +3012,7 @@ class VIEW3D_MT_pose_transform(Menu):
 class VIEW3D_MT_pose_slide(Menu):
     bl_label = "In-Betweens"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("pose.push")
@@ -3023,7 +3023,7 @@ class VIEW3D_MT_pose_slide(Menu):
 class VIEW3D_MT_pose_propagate(Menu):
     bl_label = "Propagate"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("pose.propagate").mode = 'WHILE_HELD'
@@ -3045,7 +3045,7 @@ class VIEW3D_MT_pose_propagate(Menu):
 class VIEW3D_MT_pose_library(Menu):
     bl_label = "Pose Library"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("poselib.browse_interactive", text="Browse Poses...")
@@ -3060,7 +3060,7 @@ class VIEW3D_MT_pose_library(Menu):
 class VIEW3D_MT_pose_motion(Menu):
     bl_label = "Motion Paths"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("pose.paths_calculate", text="Calculate")
@@ -3092,7 +3092,7 @@ class VIEW3D_MT_pose_group(Menu):
 class VIEW3D_MT_pose_ik(Menu):
     bl_label = "Inverse Kinematics"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("pose.ik_add")
@@ -3102,7 +3102,7 @@ class VIEW3D_MT_pose_ik(Menu):
 class VIEW3D_MT_pose_constraints(Menu):
     bl_label = "Constraints"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("pose.constraint_add_with_targets", text="Add (With Targets)...")
@@ -3117,7 +3117,7 @@ class VIEW3D_MT_pose_showhide(ShowHideMenu, Menu):
 class VIEW3D_MT_pose_apply(Menu):
     bl_label = "Apply"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("pose.armature_apply")
@@ -3132,7 +3132,7 @@ class VIEW3D_MT_pose_apply(Menu):
 class VIEW3D_MT_pose_context_menu(Menu):
     bl_label = "Pose Context Menu"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_REGION_WIN'
@@ -3228,7 +3228,7 @@ class VIEW3D_MT_bone_options_disable(Menu, BoneOptions):
 class VIEW3D_MT_edit_mesh(Menu):
     bl_label = "Mesh"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         with_bullet = bpy.app.build_options.bullet
@@ -3468,7 +3468,7 @@ class VIEW3D_MT_edit_mesh_context_menu(Menu):
 class VIEW3D_MT_edit_mesh_select_mode(Menu):
     bl_label = "Mesh Select Mode"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_REGION_WIN'
@@ -3521,7 +3521,7 @@ class VIEW3D_MT_edit_mesh_extrude(Menu):
 class VIEW3D_MT_edit_mesh_vertices(Menu):
     bl_label = "Vertex"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.operator_context = 'INVOKE_REGION_WIN'
 
@@ -3605,7 +3605,7 @@ class VIEW3D_MT_edit_mesh_edges_data(Menu):
 class VIEW3D_MT_edit_mesh_edges(Menu):
     bl_label = "Edge"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         with_freestyle = bpy.app.build_options.freestyle
@@ -3662,7 +3662,7 @@ class VIEW3D_MT_edit_mesh_edges(Menu):
 class VIEW3D_MT_edit_mesh_faces_data(Menu):
     bl_label = "Face Data"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         with_freestyle = bpy.app.build_options.freestyle
@@ -3688,7 +3688,7 @@ class VIEW3D_MT_edit_mesh_faces(Menu):
     bl_label = "Face"
     bl_idname = "VIEW3D_MT_edit_mesh_faces"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'INVOKE_REGION_WIN'
@@ -3735,7 +3735,7 @@ class VIEW3D_MT_edit_mesh_faces(Menu):
 class VIEW3D_MT_edit_mesh_normals(Menu):
     bl_label = "Normals"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mesh.normals_make_consistent", text="Recalculate Outside").inside = False
@@ -3774,7 +3774,7 @@ class VIEW3D_MT_edit_mesh_normals(Menu):
 class VIEW3D_MT_edit_mesh_shading(Menu):
     bl_label = "Shading"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mesh.faces_shade_smooth", text="Smooth Faces")
@@ -3797,14 +3797,14 @@ class VIEW3D_MT_edit_mesh_shading(Menu):
 class VIEW3D_MT_edit_mesh_weights(Menu):
     bl_label = "Weights"
 
-    def draw(self, context):
+    def draw(self, _context):
         VIEW3D_MT_paint_weight.draw_generic(self.layout, is_editmode=True)
 
 
 class VIEW3D_MT_edit_mesh_clean(Menu):
     bl_label = "Clean Up"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mesh.delete_loose")
@@ -3827,7 +3827,7 @@ class VIEW3D_MT_edit_mesh_clean(Menu):
 class VIEW3D_MT_edit_mesh_delete(Menu):
     bl_label = "Delete"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_enum("mesh.delete", "type")
@@ -3855,7 +3855,7 @@ class VIEW3D_MT_edit_mesh_showhide(ShowHideMenu, Menu):
 class VIEW3D_MT_edit_gpencil_delete(Menu):
     bl_label = "Delete"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_enum("gpencil.delete", "type")
@@ -3871,7 +3871,7 @@ class VIEW3D_MT_edit_gpencil_delete(Menu):
 # draw_curve is used by VIEW3D_MT_edit_curve and VIEW3D_MT_edit_surface
 
 
-def draw_curve(self, context):
+def draw_curve(self, _context):
     layout = self.layout
 
     layout.menu("VIEW3D_MT_transform")
@@ -3949,7 +3949,7 @@ class VIEW3D_MT_edit_curve_ctrlpoints(Menu):
 class VIEW3D_MT_edit_curve_segments(Menu):
     bl_label = "Segments"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("curve.subdivide")
@@ -3959,7 +3959,7 @@ class VIEW3D_MT_edit_curve_segments(Menu):
 class VIEW3D_MT_edit_curve_clean(Menu):
     bl_label = "Clean Up"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("curve.decimate")
@@ -3968,7 +3968,7 @@ class VIEW3D_MT_edit_curve_clean(Menu):
 class VIEW3D_MT_edit_curve_context_menu(Menu):
     bl_label = "Curve Context Menu"
 
-    def draw(self, context):
+    def draw(self, _context):
         # TODO(campbell): match mesh vertex menu.
 
         layout = self.layout
@@ -4023,7 +4023,7 @@ class VIEW3D_MT_edit_curve_context_menu(Menu):
 class VIEW3D_MT_edit_curve_delete(Menu):
     bl_label = "Delete"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_enum("curve.delete", "type")
@@ -4046,7 +4046,7 @@ class VIEW3D_MT_edit_surface(Menu):
 class VIEW3D_MT_edit_font(Menu):
     bl_label = "Font"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("font.style_toggle", text="Toggle Bold").style = 'BOLD'
@@ -4065,7 +4065,7 @@ class VIEW3D_MT_edit_font(Menu):
 class VIEW3D_MT_edit_text_chars(Menu):
     bl_label = "Special Characters"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("font.text_insert", text="Copyright").text = "\u00A9"
@@ -4105,7 +4105,7 @@ class VIEW3D_MT_edit_text_chars(Menu):
 class VIEW3D_MT_edit_meta(Menu):
     bl_label = "Metaball"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.menu("VIEW3D_MT_transform")
@@ -4127,7 +4127,7 @@ class VIEW3D_MT_edit_meta(Menu):
 class VIEW3D_MT_edit_meta_showhide(Menu):
     bl_label = "Show/Hide"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("mball.reveal_metaelems")
@@ -4138,7 +4138,7 @@ class VIEW3D_MT_edit_meta_showhide(Menu):
 class VIEW3D_MT_edit_lattice(Menu):
     bl_label = "Lattice"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.separator()
@@ -4260,7 +4260,7 @@ class VIEW3D_MT_armature_context_menu(Menu):
 class VIEW3D_MT_edit_armature_names(Menu):
     bl_label = "Names"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_context = 'EXEC_REGION_WIN'
@@ -4273,7 +4273,7 @@ class VIEW3D_MT_edit_armature_names(Menu):
 class VIEW3D_MT_edit_armature_parent(Menu):
     bl_label = "Parent"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("armature.parent_set", text="Make")
@@ -4283,7 +4283,7 @@ class VIEW3D_MT_edit_armature_parent(Menu):
 class VIEW3D_MT_edit_armature_roll(Menu):
     bl_label = "Bone Roll"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator_menu_enum("armature.calculate_roll", "type")
@@ -4297,7 +4297,7 @@ class VIEW3D_MT_edit_armature_roll(Menu):
 class VIEW3D_MT_edit_armature_delete(Menu):
     bl_label = "Delete"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.operator_context = 'EXEC_AREA'
 
@@ -4312,7 +4312,7 @@ class VIEW3D_MT_edit_armature_delete(Menu):
 class VIEW3D_MT_gpencil_autoweights(Menu):
     bl_label = "Generate Weights"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.operator("gpencil.generate_weights", text="With Empty Groups").mode = 'NAME'
         layout.operator("gpencil.generate_weights", text="With Automatic Weights").mode = 'AUTO'
@@ -4321,7 +4321,7 @@ class VIEW3D_MT_gpencil_autoweights(Menu):
 class VIEW3D_MT_gpencil_simplify(Menu):
     bl_label = "Simplify"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.operator("gpencil.stroke_simplify_fixed", text="Fixed")
         layout.operator("gpencil.stroke_simplify", text="Adaptive")
@@ -4330,7 +4330,7 @@ class VIEW3D_MT_gpencil_simplify(Menu):
 class VIEW3D_MT_paint_gpencil(Menu):
     bl_label = "Strokes"
 
-    def draw(self, context):
+    def draw(self, _context):
 
         layout = self.layout
 
@@ -4381,7 +4381,7 @@ class VIEW3D_MT_gpencil_copy_layer(Menu):
 class VIEW3D_MT_edit_gpencil(Menu):
     bl_label = "Strokes"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.menu("VIEW3D_MT_edit_gpencil_transform")
@@ -4439,7 +4439,7 @@ class VIEW3D_MT_edit_gpencil(Menu):
 class VIEW3D_MT_weight_gpencil(Menu):
     bl_label = "Weights"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("gpencil.vertex_group_normalize_all", text="Normalize All")
@@ -4461,7 +4461,7 @@ class VIEW3D_MT_gpencil_animation(Menu):
         ob = context.active_object
         return ob and ob.type == 'GPENCIL' and ob.mode != 'OBJECT'
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("gpencil.blank_frame_add")
@@ -4475,7 +4475,7 @@ class VIEW3D_MT_gpencil_animation(Menu):
 class VIEW3D_MT_edit_gpencil_transform(Menu):
     bl_label = "Transform"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("transform.translate")
@@ -4497,7 +4497,7 @@ class VIEW3D_MT_edit_gpencil_transform(Menu):
 class VIEW3D_MT_edit_gpencil_interpolate(Menu):
     bl_label = "Interpolate"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         layout.operator("gpencil.interpolate", text="Interpolate")
@@ -4507,7 +4507,7 @@ class VIEW3D_MT_edit_gpencil_interpolate(Menu):
 class VIEW3D_MT_object_mode_pie(Menu):
     bl_label = "Mode"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         pie = layout.menu_pie()
@@ -4518,7 +4518,7 @@ class VIEW3D_MT_view_pie(Menu):
     bl_label = "View"
     bl_idname = "VIEW3D_MT_view_pie"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
 
         pie = layout.menu_pie()
@@ -4609,7 +4609,7 @@ class VIEW3D_MT_orientations_pie(Menu):
 class VIEW3D_MT_snap_pie(Menu):
     bl_label = "Snap"
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         pie = layout.menu_pie()
 
@@ -4870,7 +4870,7 @@ class VIEW3D_PT_shading(Panel):
         else:
             return context.scene.display.shading
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.label(text="Viewport Shading")
 
@@ -5086,7 +5086,7 @@ class VIEW3D_PT_shading_options_shadow(Panel):
     bl_region_type = 'HEADER'
 
     @classmethod
-    def poll(cls, context):
+    def poll(cls, _context):
         return True
 
     def draw(self, context):
@@ -5106,7 +5106,7 @@ class VIEW3D_PT_shading_options_ssao(Panel):
     bl_region_type = 'HEADER'
 
     @classmethod
-    def poll(cls, context):
+    def poll(cls, _context):
         return True
 
     def draw(self, context):
@@ -5167,7 +5167,7 @@ class VIEW3D_PT_overlay(Panel):
     bl_label = "Overlays"
     bl_ui_units_x = 13
 
-    def draw(self, context):
+    def draw(self, _context):
         layout = self.layout
         layout.label(text="Viewport Overlays")
 
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 7e76701f5b4..35576063b25 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -45,15 +45,6 @@ class View3DPanel:
 
 # **************** standard tool clusters ******************
 
-# Keyframing tools
-def draw_keyframing_tools(context, layout):
-    col = layout.column(align=True)
-    col.label(text="Keyframes:")
-    row = col.row(align=True)
-    row.operator("anim.keyframe_insert_menu", text="Insert")
-    row.operator("anim.keyframe_delete_v3d", text="Remove")
-
-
 # Used by vertex & weight paint
 def draw_vpaint_symmetry(layout, vpaint):
 
@@ -559,7 +550,7 @@ class VIEW3D_PT_tools_brush_options(Panel, View3DPaintPanel):
 
 
 class TEXTURE_UL_texpaintslots(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
         # mat = data
 
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
@@ -1707,7 +1698,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_option(View3DPanel, Panel):
         brush = context.tool_settings.gpencil_paint.brush
         return brush is not None and brush.gpencil_tool not in {'ERASE', 'FILL'}
 
-    def draw_header_preset(self, context):
+    def draw_header_preset(self, _context):
         VIEW3D_PT_gpencil_brush_presets.draw_panel_header(self.layout)
 
     def draw(self, context):