diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2e8df0b7..b7b07919 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,9 +15,9 @@ jobs:
         projectPath:
           - test-package
         unityVersion:
-          - 2022.1.11f1
+          - 2022.3.19f1
           - 2019.4.40f1
-          - 2020.3.20f1
+          - 2020.3.48f1
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
diff --git a/Runtime/Model/WaitForFrame.cs b/Runtime/Model/WaitForFrame.cs
index 06ccda09..71af68ec 100644
--- a/Runtime/Model/WaitForFrame.cs
+++ b/Runtime/Model/WaitForFrame.cs
@@ -5,12 +5,7 @@ namespace Backtrace.Unity.Model
 {
     public class WaitForFrame
     {
-        private static IWaiter _waiter;
-
-        static WaitForFrame ()
-        {
-            _waiter = CreateWaiterStrategy();
-        }
+        private static IWaiter _waiter = CreateWaiterStrategy();
 
         public static YieldInstruction Wait()
         {
diff --git a/Runtime/Waiter/BatchModeWaiter.cs b/Runtime/Waiter/BatchModeWaiter.cs
index 3c048f87..389cd674 100644
--- a/Runtime/Waiter/BatchModeWaiter.cs
+++ b/Runtime/Waiter/BatchModeWaiter.cs
@@ -6,7 +6,6 @@ public class BatchModeWaiter : IWaiter
     {
         public YieldInstruction Wait()
         {
-            Debug.Log("Using BatchModeWaiter");
             return null;
         }
     }
diff --git a/Runtime/Waiter/EndOfFrameWaiter.cs b/Runtime/Waiter/EndOfFrameWaiter.cs
index 1c84e510..b5c7bc56 100644
--- a/Runtime/Waiter/EndOfFrameWaiter.cs
+++ b/Runtime/Waiter/EndOfFrameWaiter.cs
@@ -6,7 +6,6 @@ public class EndOfFrameWaiter : IWaiter
     {
         public YieldInstruction Wait()
         {
-            Debug.Log("Using EndOfFrameWaiter");
             return new WaitForEndOfFrame();
         }
     }