diff --git a/snprc_ehr/resources/queries/snprc_ehr/ActiveVets.sql b/snprc_ehr/resources/queries/snprc_ehr/ActiveVets.sql
deleted file mode 100644
index f9539b1fe..000000000
--- a/snprc_ehr/resources/queries/snprc_ehr/ActiveVets.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-/********************************************************
-Active Vet Query for  Grok.
-
-Restricted to Active flagged vets only
-Excludes vetId 2 which is (see paper records)
-
-srr 07.30.2019
-********************************************************/
-select vv.displayName as VetName
-from snprc_ehr.validVets vv
-where vv.status = 'A'
-and vv.vetId <> 2
\ No newline at end of file
diff --git a/snprc_ehr/resources/referenceStudy/study/datasets/datasets_metadata.xml b/snprc_ehr/resources/referenceStudy/study/datasets/datasets_metadata.xml
index 40dadbc39..806d12694 100644
--- a/snprc_ehr/resources/referenceStudy/study/datasets/datasets_metadata.xml
+++ b/snprc_ehr/resources/referenceStudy/study/datasets/datasets_metadata.xml
@@ -394,6 +394,11 @@
                 <datatype>varchar</datatype>
             </column>
         </columns>
+        <indices>
+            <index type="unique">
+                <column>caseid</column>
+            </index>
+        </indices>
         <tableTitle>Cases</tableTitle>
     </table>
     <table tableName="matings" tableDbType="TABLE">
@@ -1498,6 +1503,7 @@
                 <datatype>varchar</datatype>
                 <nullable>false</nullable>
                 <columnTitle>Species code (3 char)</columnTitle>
+                <scale>10</scale>
             </column>
             <column columnName="project">
                 <datatype>integer</datatype>
diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/SNPRC_EHRSequencer.java b/snprc_ehr/src/org/labkey/snprc_ehr/SNPRC_EHRSequencer.java
index 47b489813..d315252b7 100644
--- a/snprc_ehr/src/org/labkey/snprc_ehr/SNPRC_EHRSequencer.java
+++ b/snprc_ehr/src/org/labkey/snprc_ehr/SNPRC_EHRSequencer.java
@@ -30,7 +30,8 @@
 
 public enum SNPRC_EHRSequencer
 {
-    ANIMALID("org.labkey.snprc_ehr.domain.AnimalId", 100);
+    ANIMALID("org.labkey.snprc_ehr.domain.AnimalId", 100),
+    ADMITID("org.labkey.snprc_ehr.domain.AdmitId", 300000);
     // "last value assigned" is stored in the table - not the same as CAMP which is the "next value to assign"
     // new sequences are added here
     // example:
diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/query/SNPRC_EHRTriggerHelper.java b/snprc_ehr/src/org/labkey/snprc_ehr/query/SNPRC_EHRTriggerHelper.java
index 1efec61c1..e47b46555 100644
--- a/snprc_ehr/src/org/labkey/snprc_ehr/query/SNPRC_EHRTriggerHelper.java
+++ b/snprc_ehr/src/org/labkey/snprc_ehr/query/SNPRC_EHRTriggerHelper.java
@@ -40,6 +40,7 @@
 import org.labkey.api.security.UserManager;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.snprc_ehr.SNPRC_EHRSchema;
+import org.labkey.snprc_ehr.SNPRC_EHRSequencer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -222,15 +223,7 @@ public Integer getNextDietCode()
      */
     public Integer getNextCaseId()
     {
-        DbSchema dbStudySchema = SNPRC_EHRSchema.getInstance().getStudySchema();
-        SQLFragment sql = new SQLFragment("SELECT MAX(c.caseid) AS MAX_CODE FROM ");
-        sql.append(getTableInfo("study", "cases"), "c");
-        SqlSelector sqlSelector = new SqlSelector(dbStudySchema, sql);
-
-        Integer caseId = sqlSelector.getObject(Integer.class);
-
-        // if table has been truncated - reseed the caseid at 1
-        return (caseId == null) ? 1 : caseId + 1;
+        return SNPRC_EHRSequencer.ADMITID.getNext(getContainer(), getUser());
     }
 
     public Map<String, Object> getExtraContext()