diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c0bf21dad..0dd8ad1b6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,9 +12,6 @@
   <component name="ChangeListManager">
     <list default="true" id="e978b12f-4441-4d62-90dd-04c86c0aa044" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/oa4mp-qdl/buildNumber.properties" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-qdl/buildNumber.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/oa4mp-qdl/src/main/docs/creating_claim_sources.odt" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-qdl/src/main/docs/creating_claim_sources.odt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/src/main/java/edu/uiuc/ncsa/myproxy/oauth2/tools/OA2AdminClientCommands.java" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/src/main/java/edu/uiuc/ncsa/myproxy/oauth2/tools/OA2AdminClientCommands.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/target/apidocs/allclasses-frame.html" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/target/apidocs/allclasses-frame.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/target/apidocs/allclasses-noframe.html" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/target/apidocs/allclasses-noframe.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/target/apidocs/constant-values.html" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/target/apidocs/constant-values.html" afterDir="false" />
@@ -41,11 +38,8 @@
       <change beforePath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/target/oa2-admin-javadoc.jar" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/target/oa2-admin-javadoc.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/target/oa2-admin-sources.jar" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/target/oa2-admin-sources.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/target/oa2-admin.jar" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-server-admin-oauth2/target/oa2-admin.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/oa4mp-server-admin/src/main/java/edu/uiuc/ncsa/myproxy/oa4mp/server/StoreCommands2.java" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-server-admin/src/main/java/edu/uiuc/ncsa/myproxy/oa4mp/server/StoreCommands2.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/oa4mp-server-oauth1/buildNumber.properties" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-server-oauth1/buildNumber.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/oa4mp-server-oauth2/buildNumber.properties" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-server-oauth2/buildNumber.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/oa4mp-server-test-oauth2/buildNumber.properties" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-server-test-oauth2/buildNumber.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/oa4mp-xsede-oauth2/buildNumber.properties" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-xsede-oauth2/buildNumber.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/oa4mp-server-api/src/main/java/edu/uiuc/ncsa/myproxy/oa4mp/server/servlet/OA4MPServletInitializer.java" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-server-api/src/main/java/edu/uiuc/ncsa/myproxy/oa4mp/server/servlet/OA4MPServletInitializer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/oa4mp-website/src/site/xhtml/server/manuals/changelog.xhtml" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-website/src/site/xhtml/server/manuals/changelog.xhtml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -127,7 +121,7 @@
       <recent name="edu.uiuc.ncsa.myproxy.oa4mp.oauth2.storage.vo" />
     </key>
   </component>
-  <component name="RunManager" selected="Application.OA2 CLI">
+  <component name="RunManager" selected="Application.OA2 CLC">
     <configuration name="AccessTokenConfig" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="edu.uiuc.ncsa.myproxy.oa4mp.oauth2.tokens.AccessTokenConfig" />
       <module name="oa4mp-server-loader-oauth2" />
@@ -209,15 +203,13 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
       <option name="arquillianRunConfiguration">
         <value>
           <option name="containerStateName" value="" />
         </value>
       </option>
-      <option name="TEST_OBJECT" value="CLASS" />
-      <properties />
-      <listeners />
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -483,7 +475,8 @@
       <workItem from="1622814904995" duration="51097000" />
       <workItem from="1623706385698" duration="5573000" />
       <workItem from="1623775364803" duration="126904000" />
-      <workItem from="1624666019678" duration="118581000" />
+      <workItem from="1624666019678" duration="118683000" />
+      <workItem from="1625570254767" duration="4181000" />
     </task>
     <task id="LOCAL-00001" summary="IDE caused some version issues, lots of documentation updates. First cut of RFC8628 impl">
       <created>1613086394676</created>
@@ -716,14 +709,20 @@
       <option name="project" value="LOCAL" />
       <updated>1625401836510</updated>
     </task>
-    <option name="localTasksCounter" value="34" />
+    <task id="LOCAL-00034" summary="Updated CLI archive and admin unlink commands.">
+      <created>1625516594425</created>
+      <option name="number" value="00034" />
+      <option name="presentableId" value="LOCAL-00034" />
+      <option name="project" value="LOCAL" />
+      <updated>1625516594425</updated>
+    </task>
+    <option name="localTasksCounter" value="35" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Changed a super class. Also had to redo Antlr stuff, so lots of automagic updates." />
     <MESSAGE value="CIL-936, CIL-922. Fixed verification of public clients, changed base 32 encoding so padding not needed. Documentation, as always." />
     <MESSAGE value="Fixed minor regression bug that was interfering with certain LDAP queries." />
     <MESSAGE value="Tweak some command line utilities. Changed a constructor." />
@@ -748,7 +747,8 @@
     <MESSAGE value="CIL-1002,  CIL-1012, CIL-1014, CIL-1019. Had to move some classes for package visibility" />
     <MESSAGE value="CIL-1011 support. Final checkin of stuff before cutting 5.1.4." />
     <MESSAGE value="Usability tweak to CLI. CIL-1025 fixed." />
-    <option name="LAST_COMMIT_MESSAGE" value="Usability tweak to CLI. CIL-1025 fixed." />
+    <MESSAGE value="Updated CLI archive and admin unlink commands." />
+    <option name="LAST_COMMIT_MESSAGE" value="Updated CLI archive and admin unlink commands." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/oa4mp-server-api/src/main/java/edu/uiuc/ncsa/myproxy/oa4mp/server/servlet/OA4MPServletInitializer.java b/oa4mp-server-api/src/main/java/edu/uiuc/ncsa/myproxy/oa4mp/server/servlet/OA4MPServletInitializer.java
index f4d08625f..4b7cef85b 100644
--- a/oa4mp-server-api/src/main/java/edu/uiuc/ncsa/myproxy/oa4mp/server/servlet/OA4MPServletInitializer.java
+++ b/oa4mp-server-api/src/main/java/edu/uiuc/ncsa/myproxy/oa4mp/server/servlet/OA4MPServletInitializer.java
@@ -143,11 +143,6 @@ public void init() throws ServletException {
 
                 mps.processStoreCheck(s);
             }
-/*
-            mps.processStoreCheck(mps.getTransactionStore());
-            mps.processStoreCheck(mps.getServiceEnvironment().getClientStore());
-            mps.processStoreCheck(mps.getServiceEnvironment().getClientApprovalStore());
-*/
 
         } catch ( SQLException e) {
             e.printStackTrace();
diff --git a/oa4mp-website/src/site/xhtml/server/manuals/changelog.xhtml b/oa4mp-website/src/site/xhtml/server/manuals/changelog.xhtml
index 51ac43f5c..8f0e0034d 100644
--- a/oa4mp-website/src/site/xhtml/server/manuals/changelog.xhtml
+++ b/oa4mp-website/src/site/xhtml/server/manuals/changelog.xhtml
@@ -10,8 +10,21 @@
 <body class="composite">
 <!--#include virtual="../../header.html" -->
 <p>Changes to the OA4MP server by version.</p>
+<h2>5.1.4</h2>
+<p>Release date 2021-07-14</p>
+<ul>
+    <li><a href="https://jira.ncsa.illinois.edu/browse/CIL-961">CIL-961</a>: Reduced scopes supported in token exchange.</li>
+    <li><a href="https://jira.ncsa.illinois.edu/browse/CIL-971">CIL-971</a>: Token exchange does not update returned token id for compound refresh tokens.</li>
+    <li><a href="https://jira.ncsa.illinois.edu/browse/CIL-974">CIL-974</a>: Complete VO support for refresh and token exchange endpoints.</li>
+    <li><a href="https://jira.ncsa.illinois.edu/browse/CIL-980">CIL980</a>: Support for RFC 8707, the audience and resource standard.</li>
+    <li><a href="https://jira.ncsa.illinois.edu/browse/CIL-998">CIL-998</a>: WLCG groups supported.</li>
+    <li><a href="https://jira.ncsa.illinois.edu/browse/CIL-1002">CIL-1002</a>: logging per client supported.</li>
+    <li><a href="https://jira.ncsa.illinois.edu/browse/CIL-1012">CIL-1012</a>: offline_access scope supported.</li>
+    <li><a href="https://jira.ncsa.illinois.edu/browse/CIL-1019">CIL-1019</a>: preferred_username claim asserted if found for
+       profile scope.</li>
+</ul>
  <h2>5.1.3</h2>
-<p>Propsed release date 2021-06-10</p>
+<p>Release date 2021-06-10</p>
 <ul>
     <li><a href="https://jira.ncsa.illinois.edu/browse/CIL-958">CIL-958</a>: CIlogon now asserts the cilogon_uid claim, which is
         a shortened version of the unique identifier.</li>