diff --git a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts
index 5b70cb40e5..b7a87034ad 100644
--- a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts
+++ b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts
@@ -212,10 +212,6 @@ export class GrCommentThread extends KeyboardShortcutMixin(PolymerElement) {
 
   private readonly syntaxLayer = new GrSyntaxLayer();
 
-  private isCommentContextExperimentEnabled = this.flagsService.isEnabled(
-    KnownExperimentId.COMMENT_CONTEXT
-  );
-
   readonly restApiService = appContext.restApiService;
 
   constructor() {
@@ -261,11 +257,7 @@ export class GrCommentThread extends KeyboardShortcutMixin(PolymerElement) {
   }
 
   _shouldShowCommentContext(diff?: DiffInfo) {
-    return (
-      this.isCommentContextExperimentEnabled &&
-      this.showCommentContext &&
-      !!diff
-    );
+    return this.showCommentContext && !!diff;
   }
 
   addOrEditDraft(lineNum?: LineNumber, rangeParam?: CommentRange) {
diff --git a/polygerrit-ui/app/services/flags/flags.ts b/polygerrit-ui/app/services/flags/flags.ts
index 024a3a4576..1a29055830 100644
--- a/polygerrit-ui/app/services/flags/flags.ts
+++ b/polygerrit-ui/app/services/flags/flags.ts
@@ -24,10 +24,6 @@ export interface FlagsService {
  * @desc Experiment ids used in Gerrit.
  */
 export enum KnownExperimentId {
-  // Note that this flag is not supposed to be used by Gerrit itself, but can
-  // be used by plugins. The new Checks UI will show up, if a plugin registers
-  // with the new Checks plugin API.
-  CI_REBOOT_CHECKS = 'UiFeature__ci_reboot_checks',
   NEW_IMAGE_DIFF_UI = 'UiFeature__new_image_diff_ui',
-  COMMENT_CONTEXT = 'UiFeature__comment_context',
+  TOKEN_HIGHLIGHTING = 'UiFeature__token_highlighting',
 }