RGB.NET.Core/Update/TimerUpdateTrigger.cs

@@ -92,20 +92,10 @@ namespace RGB.NET.Core
                 if (UpdateTask != null)
                 {
                     UpdateTokenSource?.Cancel();
-                    try
-                    {
-                        // ReSharper disable once MethodSupportsCancellation
-                        UpdateTask.Wait();
-                    }
-                    catch (AggregateException)
-                    {
-                        // ignored
-                    }
-                    finally
-                    {
-                        UpdateTask.Dispose();
-                        UpdateTask = null;
-                    }
+                    // ReSharper disable once MethodSupportsCancellation
+                    UpdateTask.Wait();
+                    UpdateTask.Dispose();
+                    UpdateTask = null;
                 }
             }
         }

RGB.NET.Devices.CoolerMaster/Mouse/CoolerMasterMouseLedMappings.cs

@@ -48,21 +48,6 @@ namespace RGB.NET.Devices.CoolerMaster
                       { LedId.Mouse3, (0,2) }
                   }
                 },
-
-                { CoolerMasterDevicesIndexes.MM830, new Dictionary<LedId, (int row, int column)>
-                  {
-                      { LedId.Mouse1, (0,0) },
-                      { LedId.Mouse2, (0,1) },
-                      { LedId.Mouse3, (0,2) },
-                      { LedId.Mouse4, (0,3) },
-                      { LedId.Mouse5, (0,4) },
-                      { LedId.Mouse6, (0,5) },
-                      { LedId.Mouse7, (0,6) },
-                      { LedId.Mouse8, (0,7) },
-                      { LedId.Mouse9, (0,8) },
-                      { LedId.Mouse10, (0,9) },
-                  }
-                },
             };
 
         #endregion