diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index a666a04b02be401da6c2f2b628b6005db184e547..f1e284574333aba30cc216d53a0b4b104dd2b2dd 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -34,10 +34,6 @@ import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/
 import { EditorDropTarget } from 'vs/workbench/browser/parts/editor/editorDropTarget';
 import { localize } from 'vs/nls';
 
-// TODO@grid enable minimized/maximized groups in one dimension
-// - doCreateGroupView(): needs listener if the view gets minimized, the previous active group should become active
-// - doSetGroupActive():  needs a listener if the group is minimized, it should now restore to be maximized
-
 interface IEditorPartUIState {
 	serializedGrid: ISerializedGrid;
 	activeGroup: GroupIdentifier;
@@ -237,7 +233,7 @@ export class EditorPart extends Part implements IEditorGroupsServiceImpl, IEdito
 
 		const neighbourGroupView = groups[direction === GroupDirection.RIGHT || direction === GroupDirection.DOWN ? index + 1 : index - 1];
 		if (neighbourGroupView && this.gridWidget.getOrientation(neighbourGroupView) === this.gridWidget.getOrientation(sourceGroupView)) {
-			return neighbourGroupView; // TODO@grid finding neighbour needs gridwidget support
+			return neighbourGroupView; // TODO@ben finding neighbour needs gridwidget support
 		}
 
 		return void 0;
@@ -781,7 +777,7 @@ export class EditorPart extends Part implements IEditorGroupsServiceImpl, IEdito
 				this._activeGroup = void 0;
 				this.mostRecentActiveGroups = [];
 
-				this.gridError(error); // TODO@grid remove this safe guard once the grid is stable
+				this.gridError(error); // TODO@ben remove this safe guard once the grid is stable
 			}
 		}
 	}
@@ -911,7 +907,7 @@ export class EditorPart extends Part implements IEditorGroupsServiceImpl, IEdito
 		return this.groupViews.size === 1 && this._activeGroup.isEmpty();
 	}
 
-	// TODO@grid this should be removed once the gridwidget is stable
+	// TODO@ben this should be removed once the gridwidget is stable
 	private gridError(error: Error): void {
 		console.error(error);
 
@@ -977,7 +973,7 @@ export class EditorPart extends Part implements IEditorGroupsServiceImpl, IEdito
 	//#endregion
 }
 
-// Group borders (TODO@grid this should be a color the GridView exposes)
+// Group borders (TODO@ben this should be a color the GridView exposes)
 registerThemingParticipant((theme, collector) => {
 	const groupBorderColor = theme.getColor(EDITOR_GROUP_BORDER) || theme.getColor(contrastBorder);
 	if (groupBorderColor) {
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index b66f89c6ce317c3fdeaca89bcb7d7fb53fbc6b29..cee26a2323fb81c5ed1d0c389262ebec5ab2fbb0 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -1247,7 +1247,7 @@ export class Workbench extends Disposable implements IPartService {
 		return this.centeredEditorLayoutActive;
 	}
 
-	// TODO@grid support centered editor layout using empty groups or not? functionality missing:
+	// TODO@ben support centered editor layout using empty groups or not? functionality missing:
 	// - resize sashes left and right in sync
 	// - IEditorInput.supportsCenteredEditorLayout() no longer supported
 	// - should we just allow to enter layout even if groups > 1? what does it then mean to be