diff --git a/src/backend/access/external/external.c b/src/backend/access/external/external.c
index 0d8e16975bb8e2fde505cddd8d1ffd67918907da..5949e116bc85359a603460cecc99f80e37d14d96 100644
--- a/src/backend/access/external/external.c
+++ b/src/backend/access/external/external.c
@@ -773,7 +773,6 @@ create_external_scan_uri_list(ExtTableEntry *ext, bool *ismasteronly)
 
 				uri = ParseExternalTableUri(uri_str);
 
-				found_candidate = false;
 				found_match = false;
 
 				/*
@@ -804,9 +803,6 @@ create_external_scan_uri_list(ExtTableEntry *ext, bool *ismasteronly)
 								continue;	/* skip it */
 						}
 
-						/* a valid primary segdb exist on this host */
-						found_candidate = true;
-
 						if (segdb_file_map[segind] == NULL)
 						{
 							/* segdb not taken yet. assign this URI to this segdb */
diff --git a/src/backend/commands/exttablecmds.c b/src/backend/commands/exttablecmds.c
index 80e8df1f94acc6c541db7abe7afa5f57d4a9d00e..e0b26c43b2faaf913e063cc729460461f5345233 100644
--- a/src/backend/commands/exttablecmds.c
+++ b/src/backend/commands/exttablecmds.c
@@ -88,7 +88,6 @@ DefineExternalRelation(CreateExternalStmt *createExtStmt)
 	char	   *locationUris = NULL;
 	char	   *locationExec = NULL;
 	char	   *commandString = NULL;
-	char	   *customProtName = NULL;
 	char		rejectlimittype = '\0';
 	char		formattype;
 	int			rejectlimit = -1;
@@ -329,9 +328,6 @@ DefineExternalRelation(CreateExternalStmt *createExtStmt)
 									GetAssignedOidsForDispatch(),
 									NULL);
 	}
-
-	if (customProtName)
-		pfree(customProtName);
 }
 
 /*
diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h
index a3bf08013774b4740589e1d8774d2c51ad83c8f2..d7d74b1d621573939553b54f3bbbac628d026284 100644
--- a/src/include/utils/tuplesort.h
+++ b/src/include/utils/tuplesort.h
@@ -288,7 +288,6 @@ switcheroo_tuplesort_begin_cluster(TupleDesc tupDesc,
 			tuplesort_begin_cluster_pg(tupDesc, indexRel,
 									   workMem, randomAccess);
 	}
-	state->is_mk_tuplesortstate = gp_enable_mk_sort;
 	state->is_mk_tuplesortstate = false;
 	return state;
 }