diff --git a/src/Gemstone.Timeseries/Adapters/AdapterCollectionBase.cs b/src/Gemstone.Timeseries/Adapters/AdapterCollectionBase.cs
index d3415d713..eda93a3e2 100644
--- a/src/Gemstone.Timeseries/Adapters/AdapterCollectionBase.cs
+++ b/src/Gemstone.Timeseries/Adapters/AdapterCollectionBase.cs
@@ -39,11 +39,9 @@
 using Gemstone.Collections;
 using Gemstone.Collections.CollectionExtensions;
 using Gemstone.ComponentModel.DataAnnotations;
-using Gemstone.Data.Model;
 using Gemstone.Diagnostics;
 using Gemstone.EventHandlerExtensions;
 using Gemstone.IO;
-using Gemstone.Security.AccessControl;
 using Gemstone.StringExtensions;
 using Gemstone.Threading;
 using Gemstone.Threading.LogicalThreads;
diff --git a/src/Gemstone.Timeseries/Adapters/FilterAdapterCollection.cs b/src/Gemstone.Timeseries/Adapters/FilterAdapterCollection.cs
index 7199e2405..ba80865ce 100644
--- a/src/Gemstone.Timeseries/Adapters/FilterAdapterCollection.cs
+++ b/src/Gemstone.Timeseries/Adapters/FilterAdapterCollection.cs
@@ -29,7 +29,6 @@
 using System.Data;
 using System.Linq;
 using Gemstone.Data.DataExtensions;
-using Gemstone.Diagnostics;
 using Gemstone.EventHandlerExtensions;
 
 namespace Gemstone.Timeseries.Adapters;
diff --git a/src/Gemstone.Timeseries/Adapters/OutputAdapterBase.cs b/src/Gemstone.Timeseries/Adapters/OutputAdapterBase.cs
index 05799958f..1463ebc09 100644
--- a/src/Gemstone.Timeseries/Adapters/OutputAdapterBase.cs
+++ b/src/Gemstone.Timeseries/Adapters/OutputAdapterBase.cs
@@ -35,7 +35,6 @@
 using Gemstone.ComponentModel.DataAnnotations;
 using Gemstone.Diagnostics;
 using Gemstone.EventHandlerExtensions;
-using Gemstone.Security.AccessControl;
 using Gemstone.StringExtensions;
 using Gemstone.Threading;
 using Gemstone.Threading.Collections;
diff --git a/src/Gemstone.Timeseries/AlarmMeasurement.cs b/src/Gemstone.Timeseries/AlarmMeasurement.cs
index 8ebb3fce9..9a74ce362 100644
--- a/src/Gemstone.Timeseries/AlarmMeasurement.cs
+++ b/src/Gemstone.Timeseries/AlarmMeasurement.cs
@@ -37,6 +37,16 @@ public class AlarmMeasurement : Measurement
     /// </summary>
     public Guid AlarmID { get; set; }
 
+    /// <summary>
+    /// Gets or sets the identifier of the day-based shard that holds this alarm's event details.
+    /// </summary>
+    /// <remarks>
+    /// This value is derived from the day the alarm was raised and is carried on both the raise and clear
+    /// measurements so that the event details for a cleared alarm resolve to the shard for the raise day. A value
+    /// of zero indicates that no event details are associated with the alarm.
+    /// </remarks>
+    public ushort ShardID { get; set; }
+
     /// <summary>
     /// Gets or sets alarm timestamp.
     /// </summary>
diff --git a/src/Gemstone.Timeseries/Model/DeviceExpressionParser.cs b/src/Gemstone.Timeseries/Model/DeviceExpressionParser.cs
index a888d30f7..b6b21c057 100644
--- a/src/Gemstone.Timeseries/Model/DeviceExpressionParser.cs
+++ b/src/Gemstone.Timeseries/Model/DeviceExpressionParser.cs
@@ -29,9 +29,7 @@
 using Gemstone.Data.DataExtensions;
 using Gemstone.Data.Model;
 using Gemstone.IO.Parsing;
-using Gemstone.Numeric.EE;
 using Gemstone.StringExtensions;
-using Newtonsoft.Json.Linq;
 using ConfigSettings = Gemstone.Configuration.Settings;
 
 namespace Gemstone.Timeseries.Model;
diff --git a/src/Gemstone.Timeseries/ServiceHostBase.cs b/src/Gemstone.Timeseries/ServiceHostBase.cs
index 3499f2649..4896574a2 100644
--- a/src/Gemstone.Timeseries/ServiceHostBase.cs
+++ b/src/Gemstone.Timeseries/ServiceHostBase.cs
@@ -40,7 +40,6 @@
 using Gemstone.Caching;
 using Gemstone.Configuration;
 using Gemstone.Data;
-using Gemstone.Data.Model;
 using Gemstone.Data.DataSetExtensions;
 using Gemstone.Diagnostics;
 using Gemstone.EventHandlerExtensions;
diff --git a/src/Gemstone.Timeseries/Statistics/StatisticsEngine.cs b/src/Gemstone.Timeseries/Statistics/StatisticsEngine.cs
index 4b55369ce..6dab0a57d 100644
--- a/src/Gemstone.Timeseries/Statistics/StatisticsEngine.cs
+++ b/src/Gemstone.Timeseries/Statistics/StatisticsEngine.cs
@@ -44,7 +44,6 @@
 using Gemstone.EventHandlerExtensions;
 using Gemstone.IO;
 using Gemstone.IO.Parsing;
-using Gemstone.Security.AccessControl;
 using Gemstone.StringExtensions;
 using Gemstone.Threading.SynchronizedOperations;
 using Gemstone.Timeseries.Adapters;
diff --git a/src/Gemstone.Timeseries/TimeseriesStartupOperations.cs b/src/Gemstone.Timeseries/TimeseriesStartupOperations.cs
index 6077a53d6..1b79cc075 100644
--- a/src/Gemstone.Timeseries/TimeseriesStartupOperations.cs
+++ b/src/Gemstone.Timeseries/TimeseriesStartupOperations.cs
@@ -25,11 +25,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Data;
-using System.Data.Common;
 using Gemstone.Data;
 using Gemstone.Data.DataExtensions;
-using Gemstone.Identity;
 using Gemstone.StringExtensions;
 using Gemstone.Timeseries.Statistics;