diff --git a/web/gui/src/main/webapp/app/fw/util/keys.js b/web/gui/src/main/webapp/app/fw/util/keys.js
index ad8ede5..d8cbea6 100644
--- a/web/gui/src/main/webapp/app/fw/util/keys.js
+++ b/web/gui/src/main/webapp/app/fw/util/keys.js
@@ -115,6 +115,7 @@
 
     function quickHelp(view, key, code, ev) {
         // TODO: show quick help
+        // delegate to QuickHelp service.
         //libApi.quickHelp.show(keyHandler);
         console.log('QUICK-HELP');
         return true;
@@ -122,6 +123,7 @@
 
     function escapeKey(view, key, code, ev) {
         // TODO: plumb in handling of alerts and quick help dismissal
+        // We will delegate to the Alert / QuickHelp Services as appropriate.
 /*
         if (alerts.open) {
             closeAlerts();
diff --git a/web/gui/src/main/webapp/tests/app/fw/util/keys-spec.js b/web/gui/src/main/webapp/tests/app/fw/util/keys-spec.js
index 79d0caa..a297bf9 100644
--- a/web/gui/src/main/webapp/tests/app/fw/util/keys-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/util/keys-spec.js
@@ -77,18 +77,6 @@
         element.dispatchEvent(ev);
     }
 
-    // === Theme related tests
-    // TODO: fix these tests once we have ThemeService
-/*
-    it('should start in light theme', function () {
-        expect(ks.theme()).toEqual('light');
-    });
-    it('should toggle to dark theme', function () {
-        jsKeyDown(elem, 84); // 'T'
-        expect(ks.theme()).toEqual('dark');
-    });
-*/
-
     // === Key binding related tests
     it('should start with default key bindings', function () {
         var state = ks.keyBindings(),