diff --git a/server/plugins/pfed-sso/src/main/java/com/walmartlabs/concord/server/plugins/pfedsso/SsoHandler.java b/server/plugins/pfed-sso/src/main/java/com/walmartlabs/concord/server/plugins/pfedsso/SsoHandler.java
index 8c1df8c17c..7a68af83d4 100644
--- a/server/plugins/pfed-sso/src/main/java/com/walmartlabs/concord/server/plugins/pfedsso/SsoHandler.java
+++ b/server/plugins/pfed-sso/src/main/java/com/walmartlabs/concord/server/plugins/pfedsso/SsoHandler.java
@@ -63,15 +63,12 @@ public AuthenticationToken createToken(ServletRequest request, ServletResponse r
             return null;
         }
 
-        //TODO: If token comes in from bearer token, then this should be an access_token.
-        // Use this directly to get the user profile i.e. ssoClient.getProfile(accessToken);
-
         String login = jwtAuthenticator.validateTokenAndGetLogin(incomingToken);
         if (login == null) {
             return null;
         }
 
-        String[] as = parseDomain(login); //TODO: Can we not get this info from userInfo endpoint? i.e. SsoClient.Profile
+        String[] as = parseDomain(login);
 
         SsoClient.Profile profile;
         try {
@@ -83,7 +80,6 @@ public AuthenticationToken createToken(ServletRequest request, ServletResponse r
         if (profile == null) {
             return null;
         }
-        //TODO: User name and domain should be returned by the userInfo endpoint(profile) "sub". Do we really need these two? as[0], as[1]
         return new SsoToken(as[0], as[1], profile.displayName(), profile.mail(), profile.userPrincipalName(), profile.nameInNamespace(), profile.groups());
     }