diff --git a/java/com/google/gerrit/server/config/ConfigSection.java b/java/com/google/gerrit/server/config/ConfigSection.java
deleted file mode 100644
index 057ce99..0000000
--- a/java/com/google/gerrit/server/config/ConfigSection.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (C) 2012 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.gerrit.server.config;
-
-import org.eclipse.jgit.lib.Config;
-
-/** Provides access to one section from {@link Config} */
-public class ConfigSection {
-
-  private final Config cfg;
-  private final String section;
-
-  public ConfigSection(Config cfg, String section) {
-    this.cfg = cfg;
-    this.section = section;
-  }
-
-  public String optional(String name) {
-    return cfg.getString(section, null, name);
-  }
-
-  public String required(String name) {
-    return ConfigUtil.getRequired(cfg, section, name);
-  }
-}
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.ts b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.ts
index 4180c8c..a09466b 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.ts
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.ts
@@ -383,7 +383,6 @@
     return html`
       <gr-account-link
         hideAvatar
-        hideStatus
         firstName
         highlightAttention
         .change=${this.change}
diff --git a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts
index 99e10ae..274601f 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts
+++ b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts
@@ -85,9 +85,6 @@
   })
   cancelLeftPadding = false;
 
-  @property({type: Boolean})
-  hideStatus = false;
-
   @state()
   _config?: ServerInfo;
 
@@ -163,14 +160,6 @@
           height: 12px;
           vertical-align: top;
         }
-        iron-icon.status {
-          color: var(--deemphasized-text-color);
-          width: 14px;
-          height: 14px;
-          vertical-align: top;
-          position: relative;
-          top: 2px;
-        }
         .name {
           display: inline-block;
           text-decoration: inherit;
@@ -259,12 +248,6 @@
           <span class="name">
             ${this._computeName(account, this.firstName, this._config)}
           </span>
-          ${!this.hideStatus && account.status
-            ? html`<iron-icon
-                class="status"
-                icon="gr-icons:unavailable"
-              ></iron-icon>`
-            : ''}
           ${this.renderAccountStatusPlugins()}
         </span>
       </span>`;
@@ -284,8 +267,6 @@
     });
   }
 
-  // Note: account statuses from plugins are shown regardless of
-  // hideStatus setting
   private renderAccountStatusPlugins() {
     if (!this.account?._account_id) {
       return;
diff --git a/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link.ts b/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link.ts
index f0c9106..34e5043 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link.ts
+++ b/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link.ts
@@ -56,9 +56,6 @@
   @property({type: Boolean})
   hideAvatar = false;
 
-  @property({type: Boolean})
-  hideStatus = false;
-
   /**
    * Only show the first name in the account label.
    */
@@ -93,7 +90,6 @@
           ?forceAttention=${this.forceAttention}
           ?highlightAttention=${this.highlightAttention}
           ?hideAvatar=${this.hideAvatar}
-          ?hideStatus=${this.hideStatus}
           ?firstName=${this.firstName}
           .voteableText=${this.voteableText}
           exportparts="gr-account-label-text: gr-account-link-text"
diff --git a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts
index 0cf0a04..b6571ec 100644
--- a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts
+++ b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts
@@ -488,7 +488,6 @@
       <gr-account-label
         .account="${this.comment?.author ?? this.account}"
         class="${classMap(classes)}"
-        hideStatus
       >
       </gr-account-label>
     `;
diff --git a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.ts b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.ts
index 1db643a..2bf4ed2 100644
--- a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.ts
+++ b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.ts
@@ -89,7 +89,7 @@
         <div class="container" id="container">
           <div class="header" id="header">
             <div class="headerLeft">
-              <gr-account-label deselected="" hidestatus=""></gr-account-label>
+              <gr-account-label deselected=""></gr-account-label>
             </div>
             <div class="headerMiddle">
               <span class="collapsedContent">
@@ -116,7 +116,7 @@
         <div class="container" id="container">
           <div class="header" id="header">
             <div class="headerLeft">
-              <gr-account-label deselected="" hidestatus=""></gr-account-label>
+              <gr-account-label deselected=""></gr-account-label>
             </div>
             <div class="headerMiddle"></div>
             <span class="patchset-text">Patchset 1</span>
@@ -210,7 +210,7 @@
         <div class="container draft" id="container">
           <div class="header" id="header">
             <div class="headerLeft">
-              <gr-account-label class="draft" deselected="" hidestatus=""></gr-account-label>
+              <gr-account-label class="draft" deselected=""></gr-account-label>
               <gr-tooltip-content
                 class="draftTooltip" has-tooltip="" max-width="20em" show-icon=""
                 title="This draft is only visible to you. To publish drafts, click the 'Reply' or 'Start review' button at the top of the change or press the 'a' key."
@@ -263,7 +263,7 @@
         <div class="container draft" id="container">
           <div class="header" id="header">
             <div class="headerLeft">
-              <gr-account-label class="draft" deselected="" hidestatus=""></gr-account-label>
+              <gr-account-label class="draft" deselected=""></gr-account-label>
               <gr-tooltip-content
                 class="draftTooltip" has-tooltip="" max-width="20em" show-icon=""
                 title="This draft is only visible to you. To publish drafts, click the 'Reply' or 'Start review' button at the top of the change or press the 'a' key."
diff --git a/polygerrit-ui/app/elements/shared/gr-hovercard-account/gr-hovercard-account.ts b/polygerrit-ui/app/elements/shared/gr-hovercard-account/gr-hovercard-account.ts
index 5262c95..184f10b 100644
--- a/polygerrit-ui/app/elements/shared/gr-hovercard-account/gr-hovercard-account.ts
+++ b/polygerrit-ui/app/elements/shared/gr-hovercard-account/gr-hovercard-account.ts
@@ -233,10 +233,7 @@
     if (!this.account.status) return;
     return html`
       <div class="status">
-        <span class="title">
-          <iron-icon icon="gr-icons:unavailable"></iron-icon>
-          Status:
-        </span>
+        <span class="title">Status:</span>
         <span class="value">${this.account.status}</span>
       </div>
     `;