diff --git a/common/lib/xmodule/xmodule/templates/html/grade_me.yaml b/common/lib/xmodule/xmodule/templates/html/grade_me.yaml
deleted file mode 100644
index bbdb3041c242..000000000000
--- a/common/lib/xmodule/xmodule/templates/html/grade_me.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-metadata:
-    display_name: (Grade Me!)  Button
-data: |
-      <p id="verify_button_by_clicking_msg">By clicking the button below, you assert that you have completed the course in its entirety.</p>
-
-      <p><input type=button value="Yes, I Agree." id="User_Verify_Button" style="margin-bottom: 20px;" /></p>
-      <p class="verify-button-success-text" style="font-weight: bold; color: #008200;"></p>
-      
-      <script type="text/javascript">
-        var success_message = "Your grading and certification request has been received, <br />if you have passed, your certificate should be available in the next 20 minutes.";
-        var failure_message = "We're sorry; users who haven't created accounts and registered for the course may not receive Statements of Accomplishment.";
-
-        // for actual value of username, use scraped_username.split(':')[1].trim(); to get actual value
-        var scraped_username = $('li.primary a.user-link').text();
-        if (scraped_username) {
-            document.getElementById('User_Verify_Button').addEventListener("click",
-            function(event) {
-              (function(event) {
-                $.ajax({
-                  type:     'POST',
-                  url:      '/request_certificate',
-                  data:     {'course_id': $$course_id},
-                  success:  function(data) {
-                    $('.verify-button-success-text').html(success_message);
-                  }
-                });
-              }).call(document.getElementById('User_Verify_Button'), event);
-            });
-        } else {
-            $('#verify_button_by_clicking_msg').html(failure_message);
-            $('#User_Verify_Button').remove();
-        };
-      </script>
diff --git a/lms/static/js/instructor_dashboard/util.js b/lms/static/js/instructor_dashboard/util.js
index f53f6af954fb..f8ae91f4e0ca 100644
--- a/lms/static/js/instructor_dashboard/util.js
+++ b/lms/static/js/instructor_dashboard/util.js
@@ -401,6 +401,7 @@
         keywordValidator.keyword_regex = /%%+[^%]+%%/g;
 
         keywordValidator.keywords = [
+            '%%USERNAME%%', '%%COURSE_ID%%', '%%COURSE_START_DATE%%',
             '%%USER_ID%%', '%%USER_FULLNAME%%', '%%COURSE_DISPLAY_NAME%%', '%%COURSE_END_DATE%%'
         ];
 
diff --git a/openedx/stanford/common/djangoapps/enrollment/views.py b/openedx/stanford/common/djangoapps/enrollment/views.py
index e0a8a50e56ea..b3d63b874fe1 100644
--- a/openedx/stanford/common/djangoapps/enrollment/views.py
+++ b/openedx/stanford/common/djangoapps/enrollment/views.py
@@ -31,19 +31,6 @@
 from openedx.stanford.common.djangoapps.enrollment.data import get_roster
 
 
-def _enroll(course_key, email, auto_enroll, email_students, email_params, language):
-    enroll_email(
-        course_key, email, auto_enroll, email_students, email_params, language=language
-    )
-    return Response(status=status.HTTP_204_NO_CONTENT)
-
-def _unenroll(course_key, email, email_students, email_params, language):
-    unenroll_email(
-        course_key, email, email_students, email_params, language=language
-    )
-    return Response(status=status.HTTP_204_NO_CONTENT)
-
-
 class EnrollmentRosterView(APIView, ApiKeyPermissionMixIn):
     """
     Read roster for a particular course. (contains PII)
@@ -127,7 +114,10 @@ def put(self, request, course_id):
             if User.objects.filter(email=email).exists():
                 user = User.objects.get(email=email)
                 language = get_user_email_language(user)
-        return _enroll(course_key, email, auto_enroll, email_students, email_params, language)
+        enroll_email(
+            course_key, email, auto_enroll, email_students, email_params, language=language
+        )
+        return Response(status=status.HTTP_204_NO_CONTENT)
 
     def delete(self, request, course_id):
         """
@@ -179,4 +169,7 @@ def delete(self, request, course_id):
             if User.objects.filter(email=email).exists():
                 user = User.objects.get(email=email)
                 language = get_user_email_language(user)
-        return _unenroll(course_key, email, email_students, email_params, language)
+        unenroll_email(
+            course_key, email, email_students, email_params, language=language
+        )
+        return Response(status=status.HTTP_204_NO_CONTENT)