diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java b/nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java
index 59dac4c5..2ecd4dfa 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java
@@ -183,7 +183,6 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
 
         EHRService.get().registerMoreActionsButton(new ShowEditUIButton(this, "ehr", "observation_types", EHRDataAdminPermission.class), "ehr", "observation_types");
 
-        EHRService.get().unregisterMoreActionsButtons("study", "treatment_order");
         EHRService.get().registerMoreActionsButton(new MarkCompletedButton(this, "study", "observation_order", "Set End Date"), "study", "observation_order");
         EHRService.get().registerMoreActionsButton(new MarkCompletedButton(this, "study", "flags", "Set End Date"), "study", "flags");
 
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/DrugAdminDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/DrugAdminDataSource.java
index 24dc3260..1c6ccbe3 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/history/DrugAdminDataSource.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/DrugAdminDataSource.java
@@ -48,7 +48,10 @@ else if (volumeExists)
         {
             sb.append(safeAppend(rs, "Volume", rs.getString("volume") + " " + rs.getString("vol_units")));
         }
-        sb.append(safeAppend(rs, "Performed By", "performedby/displayName"));
+        /*if (!redacted)
+        {
+            sb.append(safeAppend(rs, "Performed By", "performedby/displayName"));
+        }*/
         sb.append(safeAppend(rs, "Remark", "remark"));
 
         return sb.toString();
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseOpenDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseOpenDataSource.java
index 79f9693b..0f9a2345 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseOpenDataSource.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseOpenDataSource.java
@@ -28,10 +28,10 @@ protected String getHtml(Container c, Results rs, boolean redacted) throws SQLEx
         sb.append(safeAppend(rs, "Open Remark", "openRemark"));
         sb.append(safeAppend(rs, "Case Plan", "plan"));
 
-        if (!redacted)
+        /*if (!redacted)
         {
             sb.append(safeAppend(rs, "Opened By", "performedby/displayName"));
-        }
+        }*/
 
         if (rs.getObject(FieldKey.fromString("enddate")) != null)
         {
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCClinicalRemarksDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCClinicalRemarksDataSource.java
index 28df3607..00c18b55 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCClinicalRemarksDataSource.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCClinicalRemarksDataSource.java
@@ -43,11 +43,11 @@ protected String getHtml(Container c, Results rs, boolean redacted) throws SQLEx
         StringBuilder sb = new StringBuilder();
         sb.append("<table>");
 
-        if (!redacted && rs.getObject(FieldKey.fromString("performedby/displayName")) != null)
+        /*if (!redacted && rs.getObject(FieldKey.fromString("performedby/displayName")) != null)
         {
             String label = "Entered By";
             appendNote(rs, "performedby/displayName", "<span style='white-space:nowrap'>" + label + "</span>", sb);
-        }
+        }*/
 
         appendNote(rs, "hx", "Hx", sb);
         appendNote(rs, "so", "S/O", sb);
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java
index 1e4d9e58..c08dfb46 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java
@@ -45,8 +45,10 @@ else if (volumeExists)
         {
             sb.append(safeAppend(rs, "Volume", rs.getString("volume") + " " + rs.getString("vol_units")));
         }
-        sb.append(safeAppend(rs, "End Ordered By", "orderedby/displayName"));
-
+        /*if (!redacted)
+        {
+            sb.append(safeAppend(rs, "End Ordered By", "orderedby/displayName"));
+        }*/
         return sb.toString();
     }
 
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationOrdersDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationOrdersDataSource.java
index a44637cb..ad27f4e9 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationOrdersDataSource.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationOrdersDataSource.java
@@ -106,10 +106,10 @@ protected List<HistoryRow> processRows(Container c, TableSelector ts, final bool
                 html.append(rowMap.get("html"));
             }
 
-            if (performedBy != null && !redacted)
+            /*if (performedBy != null && !redacted)
             {
                 html.append("Ordered By: ").append(PageFlowUtil.filter(performedBy)).append("\n");
-            }
+            }*/
 
             HistoryRow row = new HistoryRowImpl(this, categoryText, categoryGroup, categoryColor, subjectId, date, html.toString(), qcStateLabel, publicData, taskId, taskRowId, formType, objectId);
             row.setShowTime(false);
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationsDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationsDataSource.java
index 269800c4..97ebccc5 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationsDataSource.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationsDataSource.java
@@ -109,10 +109,10 @@ protected List<HistoryRow> processRows(Container c, TableSelector ts, final bool
                 html.append(rowMap.get("html"));
             }
 
-            if (performedBy != null && !redacted)
+            /*if (performedBy != null && !redacted)
             {
                 html.append("Performed By: ").append(PageFlowUtil.filter(performedBy)).append("\n");
-            }
+            }*/
 
             HistoryRow row = new HistoryRowImpl(this, categoryText, categoryGroup, categoryColor, subjectId, date, html.toString(), qcStateLabel, publicData, taskId, taskRowId, formType, objectId);
             row.setShowTime(false);