diff --git a/Source/Applications/openPDC/openPDC/DataHub.cs b/Source/Applications/openPDC/openPDC/DataHub.cs
index 645a8d69f6..5ffd550ac9 100644
--- a/Source/Applications/openPDC/openPDC/DataHub.cs
+++ b/Source/Applications/openPDC/openPDC/DataHub.cs
@@ -266,19 +266,23 @@ public void AddNewOrUpdateDevice(Device device)
         DataContext.Table<Device>().AddNewOrUpdateRecord(device);
     }
 
+    [AuthorizeHubRole("Administrator, Editor")]
     public void RemoveDeviceCalculations(int deviceID)
     {
         Device device = QueryDeviceByID(deviceID);
         if (device is null || device.ID == 0)
             return;
-        DataContext.Connection.ExecuteNonQuery($"DELETE FROM CustomActionAdapter WHERE TypeName = 'DynamicCalculator.DynamicCalculator' AND AdapterName LIKE '{device.Acronym}%'");
-        DataContext.Connection.ExecuteNonQuery($"DELETE FROM Measurement WHERE DeviceID = {device.ID} AND SignalTypeID = {CalcSignalTypeID}");
+
+        string searchText = $"{device.Acronym}%";
+        DataContext.Connection.ExecuteNonQuery("DELETE FROM CustomActionAdapter WHERE TypeName = 'DynamicCalculator.DynamicCalculator' AND AdapterName LIKE {0}", searchText);
+        DataContext.Connection.ExecuteNonQuery("DELETE FROM Measurement WHERE DeviceID = {0} AND SignalTypeID = {1}", device.ID, CalcSignalTypeID);
     }
 
+    [AuthorizeHubRole("Administrator, Editor")]
     public void RemoveAllDeviceCalculations()
     {
         DataContext.Connection.ExecuteNonQuery("DELETE FROM CustomActionAdapter WHERE TypeName = 'DynamicCalculator.DynamicCalculator'");
-        DataContext.Connection.ExecuteNonQuery($"DELETE FROM Measurement WHERE SignalTypeID = {CalcSignalTypeID}");
+        DataContext.Connection.ExecuteNonQuery("DELETE FROM Measurement WHERE SignalTypeID = {0}", CalcSignalTypeID);
     }
 
     #endregion