diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index f97a8c5572..f62106745b 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -1,8 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
@@ -84,11 +83,6 @@ namespace osu.Game.Screens.Edit
                         Alpha = 0,
                     },
                 };
-
-                // todo delete
-                Action = () =>
-                {
-                };
             }
 
             private Color4 colourHover;
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 5c131c0b6d..7bc59c77f8 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -23,10 +21,10 @@ namespace osu.Game.Screens.Edit.Timing
     public partial class ControlPointTable : EditorTable
     {
         [Resolved]
-        private Bindable<ControlPointGroup> selectedGroup { get; set; }
+        private Bindable<ControlPointGroup> selectedGroup { get; set; } = null!;
 
         [Resolved]
-        private EditorClock clock { get; set; }
+        private EditorClock clock { get; set; } = null!;
 
         public const float TIMING_COLUMN_WIDTH = 230;
 
@@ -81,8 +79,8 @@ namespace osu.Game.Screens.Edit.Timing
         {
             var columns = new List<TableColumn>
             {
-                new TableColumn("Time", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, TIMING_COLUMN_WIDTH)),
-                new TableColumn("Attributes", Anchor.CentreLeft),
+                new TableColumn(@"Time", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, TIMING_COLUMN_WIDTH)),
+                new TableColumn(@"Attributes", Anchor.CentreLeft),
             };
 
             return columns.ToArray();
@@ -162,12 +160,13 @@ namespace osu.Game.Screens.Edit.Timing
                                           .Where(matchFunction)
                                           .Select(createAttribute)
                                           .Where(c => c != null)
+                                          .Select(c => c!)
                                           // arbitrary ordering to make timing points first.
                                           // probably want to explicitly define order in the future.
                                           .OrderByDescending(c => c.GetType().Name);
             }
 
-            private Drawable createAttribute(ControlPoint controlPoint)
+            private Drawable? createAttribute(ControlPoint controlPoint)
             {
                 switch (controlPoint)
                 {
@@ -182,9 +181,10 @@ namespace osu.Game.Screens.Edit.Timing
 
                     case SampleControlPoint sample:
                         return new SampleRowAttribute(sample);
-                }
 
-                return null;
+                    default:
+                        return null;
+                }
             }
         }
     }
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 6fdf9c76e2..3c72815d1f 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -20,19 +18,19 @@ namespace osu.Game.Screens.Edit.Verify
 {
     public partial class IssueTable : EditorTable
     {
-        [Resolved]
-        private VerifyScreen verify { get; set; }
-
-        private Bindable<Issue> selectedIssue;
+        private Bindable<Issue> selectedIssue = null!;
 
         [Resolved]
-        private EditorClock clock { get; set; }
+        private VerifyScreen verify { get; set; } = null!;
 
         [Resolved]
-        private EditorBeatmap editorBeatmap { get; set; }
+        private EditorClock clock { get; set; } = null!;
 
         [Resolved]
-        private Editor editor { get; set; }
+        private EditorBeatmap editorBeatmap { get; set; } = null!;
+
+        [Resolved]
+        private Editor editor { get; set; } = null!;
 
         public IEnumerable<Issue> Issues
         {
@@ -88,10 +86,10 @@ namespace osu.Game.Screens.Edit.Verify
             var columns = new List<TableColumn>
             {
                 new TableColumn(string.Empty, Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn("Type", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize, minSize: 60)),
-                new TableColumn("Time", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize, minSize: 60)),
-                new TableColumn("Message", Anchor.CentreLeft),
-                new TableColumn("Category", Anchor.CentreRight, new Dimension(GridSizeMode.AutoSize)),
+                new TableColumn(@"Type", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize, minSize: 60)),
+                new TableColumn(@"Time", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize, minSize: 60)),
+                new TableColumn(@"Message", Anchor.CentreLeft),
+                new TableColumn(@"Category", Anchor.CentreRight, new Dimension(GridSizeMode.AutoSize)),
             };
 
             return columns.ToArray();