diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 8834af7ecff..aee82cbe4fe 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -744,7 +744,6 @@ export class CommandCenter {
 		const message = await getCommitMessage();
 
 		if (!message) {
-			// TODO@joao: show modal dialog to confirm empty message commit
 			return false;
 		}
 
@@ -1287,7 +1286,6 @@ export class CommandCenter {
 		return result;
 	}
 
-	// TODO@Joao: possibly remove? do we really need to return resources?
 	private getSCMResource(uri?: Uri): Resource | undefined {
 		uri = uri ? uri : window.activeTextEditor && window.activeTextEditor.document.uri;
 
@@ -1322,7 +1320,6 @@ export class CommandCenter {
 		const groups = resources.reduce((result, resource) => {
 			const repository = this.model.getRepository(resource);
 
-			// TODO@Joao: what should happen?
 			if (!repository) {
 				console.warn('Could not find git repository for ', resource);
 				return result;
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 87a59d9232d..d72b4783f23 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -411,7 +411,6 @@ export class Repository implements Disposable {
 		this.status();
 	}
 
-	// TODO@Joao reorganize this
 	provideOriginalResource(uri: Uri): Uri | undefined {
 		if (uri.scheme !== 'file') {
 			return;
diff --git a/extensions/git/src/util.ts b/extensions/git/src/util.ts
index 8d5c9b20251..632fd5a0a86 100644
--- a/extensions/git/src/util.ts
+++ b/extensions/git/src/util.ts
@@ -83,7 +83,6 @@ export function once(fn: (...args: any[]) => any): (...args: any[]) => any {
 	};
 }
 
-// TODO@Joao: replace with Object.assign
 export function assign<T>(destination: T, ...sources: any[]): T {
 	for (const source of sources) {
 		Object.keys(source).forEach(key => destination[key] = source[key]);