diff --git a/nirc_ehr/resources/queries/dbo/q_clinremarks.sql b/nirc_ehr/resources/queries/dbo/q_clinremarks.sql
index 9442286b..035a6e63 100644
--- a/nirc_ehr/resources/queries/dbo/q_clinremarks.sql
+++ b/nirc_ehr/resources/queries/dbo/q_clinremarks.sql
@@ -5,8 +5,7 @@ SELECT anmEvt.ANIMAL_EVENT_ID
             WHEN (trim(anmEvt.STAFF_ID.STAFF_FIRST_NAME) IS NULL OR trim(anmEvt.STAFF_ID.STAFF_LAST_NAME) IS NULL) THEN 'unknown'
             ELSE (trim(anmEvt.STAFF_ID.STAFF_FIRST_NAME)
                 || '|' || trim(anmEvt.STAFF_ID.STAFF_LAST_NAME)) END)                  AS performedby,
-       anmEvt.DIAGNOSIS                                                          AS vetreview,
-       anmCmt.TEXT                                                               AS remark,
+       ('Note: ' || COALESCE(anmCmt.TEXT, 'None') || '; Diagnosis: ' || COALESCE(anmEvt.DIAGNOSIS, 'None')) AS remark,
        'Clinical'                                                                AS category,
        CASE WHEN anmEvt.ATTACHMENT_PATH IS NOT NULL THEN
             ('C:\Program Files\Labkey\labkey\files\NIRC\EHR\@files\attachments'
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBaseTaskFormType.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBaseTaskFormType.java
index f0e9202e..5c4d0719 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBaseTaskFormType.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBaseTaskFormType.java
@@ -36,7 +36,6 @@ protected List<String> getMoreActionButtonConfigs()
     {
         List<String> configs = super.getMoreActionButtonConfigs();
         configs.remove("REVIEW");
-        configs.remove("DISCARD");
         return configs;
     }
 }
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBehaviorRoundsFormType.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBehaviorRoundsFormType.java
index 3bab8808..b2a78138 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBehaviorRoundsFormType.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBehaviorRoundsFormType.java
@@ -93,4 +93,12 @@ protected List<String> getButtonConfigs()
 
         return ret;
     }
+
+    @Override
+    protected List<String> getMoreActionButtonConfigs()
+    {
+        List<String> configs = super.getMoreActionButtonConfigs();
+        configs.remove("DISCARD");
+        return configs;
+    }
 }
\ No newline at end of file
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBehavioralCasesFormType.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBehavioralCasesFormType.java
index a0769965..68b957fc 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBehavioralCasesFormType.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBehavioralCasesFormType.java
@@ -97,4 +97,12 @@ protected List<String> getButtonConfigs()
 
         return ret;
     }
+
+    @Override
+    protected List<String> getMoreActionButtonConfigs()
+    {
+        List<String> configs = super.getMoreActionButtonConfigs();
+        configs.remove("DISCARD");
+        return configs;
+    }
 }
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCCasesFormType.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCCasesFormType.java
index 33ab2a91..7eb3a88c 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCCasesFormType.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCCasesFormType.java
@@ -109,4 +109,12 @@ protected List<String> getButtonConfigs()
 
         return ret;
     }
+
+    @Override
+    protected List<String> getMoreActionButtonConfigs()
+    {
+        List<String> configs = super.getMoreActionButtonConfigs();
+        configs.remove("DISCARD");
+        return configs;
+    }
 }
\ No newline at end of file
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCClinicalRoundsFormType.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCClinicalRoundsFormType.java
index bb3dd342..12d64931 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCClinicalRoundsFormType.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCClinicalRoundsFormType.java
@@ -101,4 +101,12 @@ protected List<String> getButtonConfigs()
 
         return ret;
     }
+
+    @Override
+    protected List<String> getMoreActionButtonConfigs()
+    {
+        List<String> configs = super.getMoreActionButtonConfigs();
+        configs.remove("DISCARD");
+        return configs;
+    }
 }
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCDeathNecropsyFormType.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCDeathNecropsyFormType.java
index 8ab094f6..cd601bb5 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCDeathNecropsyFormType.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCDeathNecropsyFormType.java
@@ -63,4 +63,12 @@ else if (isVetTech)
         }
         return defaultButtons;
     }
+
+    @Override
+    protected List<String> getMoreActionButtonConfigs()
+    {
+        List<String> configs = super.getMoreActionButtonConfigs();
+        configs.remove("DISCARD");
+        return configs;
+    }
 }