diff --git a/java/google/registry/ui/js/session.js b/java/google/registry/ui/js/session.js
index 8df7321fa..f2f1358ca 100644
--- a/java/google/registry/ui/js/session.js
+++ b/java/google/registry/ui/js/session.js
@@ -16,7 +16,6 @@ goog.provide('registry.Session');
 
 goog.require('goog.json');
 goog.require('goog.net.XhrIo');
-goog.require('goog.structs.Map');
 goog.require('registry.util');
 
 goog.forwardDeclare('goog.Uri');
@@ -30,7 +29,6 @@ goog.forwardDeclare('goog.Uri');
  * @param {!registry.Session.ContentType} contentType Payload mode.
  * @constructor
  * @template REQUEST, RESPONSE
- * @suppress {deprecated}
  */
 registry.Session = function(defaultUri, xsrfToken, contentType) {
 
@@ -50,13 +48,13 @@ registry.Session = function(defaultUri, xsrfToken, contentType) {
 
   /**
    * XHR request headers.
-   * @private {!goog.structs.Map.<string, string>}
+   * @private {!Map.<string, string>}
    * @const
    */
-  this.headers_ = new goog.structs.Map(
-      'Content-Type', contentType,
-      'X-CSRF-Token', xsrfToken,
-      'X-Requested-With', 'XMLHttpRequest');
+  this.headers_ = new Map([
+      ['Content-Type', contentType],
+      ['X-CSRF-Token', xsrfToken],
+      ['X-Requested-With', 'XMLHttpRequest']]);
 };
 
 
diff --git a/javatests/google/registry/ui/js/registrar/console_test_util.js b/javatests/google/registry/ui/js/registrar/console_test_util.js
index 9418099b8..dc9f31685 100644
--- a/javatests/google/registry/ui/js/registrar/console_test_util.js
+++ b/javatests/google/registry/ui/js/registrar/console_test_util.js
@@ -34,10 +34,8 @@ registry.registrar.ConsoleTestUtil.setup = function(test) {
   test.historyMock = test.mockControl.createLooseMock(goog.History, true);
   test.sessionMock = test.mockControl.createLooseMock(
       registry.registrar.EppSession, true);
-  /** @suppress {missingRequire} */
   test.mockControl.createConstructorMock(goog, 'History')()
       .$returns(test.historyMock);
-  /** @suppress {missingRequire} */
   test.mockControl
       .createConstructorMock(registry.registrar, 'EppSession')(
           goog.testing.mockmatchers.isObject)