diff --git a/src/components/Sidebar/SidebarTrigger.scss b/src/components/Sidebar/SidebarTrigger.scss
index 69e7b3f0d..790389978 100644
--- a/src/components/Sidebar/SidebarTrigger.scss
+++ b/src/components/Sidebar/SidebarTrigger.scss
@@ -23,7 +23,6 @@
       height: var(--lg-icon-size);
     }
 
-    // TODO follow-participant
     &__label-element {
       align-self: flex-start;
     }
diff --git a/src/components/Sidebar/SidebarTrigger.tsx b/src/components/Sidebar/SidebarTrigger.tsx
index aa11de77c..889156eba 100644
--- a/src/components/Sidebar/SidebarTrigger.tsx
+++ b/src/components/Sidebar/SidebarTrigger.tsx
@@ -19,7 +19,6 @@ export const SidebarTrigger = ({
   const appState = useUIAppState();
 
   return (
-    // TODO follow-participant
     <label title={title} className="sidebar-trigger__label-element">
       <input
         className="ToolIcon_type_checkbox"
diff --git a/src/components/UserList.scss b/src/components/UserList.scss
index d869cf7fe..e7469d707 100644
--- a/src/components/UserList.scss
+++ b/src/components/UserList.scss
@@ -16,18 +16,17 @@
       display: none;
     }
 
-    // can fit max 5 avatars in a column
-    max-height: 140px;
+    box-sizing: border-box;
 
-    // can fit max 10 avatars in a row when there's enough space
-    max-width: 290px;
+    // can fit max 4 avatars (3 avatars + show more) in a column
+    max-height: 120px;
+
+    // can fit max 4 avatars (3 avatars + show more) when there's enough space
+    max-width: 120px;
 
     // Tweak in 30px increments to fit more/fewer avatars in a row/column ^^
 
-    // TODO follow-participant
-    // rethink the above given that we'll have 3 avatars + "more" button max
-    // most likely
-    // overflow: hidden;
+    overflow: hidden;
   }
 
   .UserList > * {
diff --git a/src/excalidraw-app/collab/Collab.tsx b/src/excalidraw-app/collab/Collab.tsx
index 0fa5fb3ed..b223b7a25 100644
--- a/src/excalidraw-app/collab/Collab.tsx
+++ b/src/excalidraw-app/collab/Collab.tsx
@@ -833,7 +833,6 @@ class Collab extends PureComponent<Props, CollabState> {
         this.portal.socket &&
           this.portal.broadcastScrollAndZoom(
             { bounds: [x1, y1, x2, y2] },
-            // TODO follow-participant
             `follow_${this.portal.socket.id}`,
           );
       }
diff --git a/src/excalidraw-app/collab/Portal.tsx b/src/excalidraw-app/collab/Portal.tsx
index 0fab855be..cca01cdd2 100644
--- a/src/excalidraw-app/collab/Portal.tsx
+++ b/src/excalidraw-app/collab/Portal.tsx
@@ -83,7 +83,6 @@ class Portal {
   async _broadcastSocketData(
     data: SocketUpdateData,
     volatile: boolean = false,
-    // TODO follow-participant
     roomId?: string,
   ) {
     if (this.isOpen()) {
@@ -93,7 +92,6 @@ class Portal {
 
       this.socket?.emit(
         volatile ? WS_EVENTS.SERVER_VOLATILE : WS_EVENTS.SERVER,
-        // TODO follow-participant
         roomId ?? this.roomId,
         encryptedBuffer,
         iv,