diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index fa8222f46fbcb36000a604da47de255297e23b56..f54847e7531e1e5d7df03fbee6befcdb19deddcd 100755
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -576,7 +576,7 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 
 	ERRORS EVERY EXCHANGE EXCLUDE
 
-	FIELDS FILESPACE FILL FILTER FOLLOWING FORMAT FORMATTER
+	FIELDS FILESPACE FILL FILTER FOLLOWING FORMAT
 
 	GROUP_ID GROUPING
 
@@ -586,11 +586,11 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 
 	LIST LOG_P
 
-	MASTER MEDIAN MERGE MIRROR MISSING MODIFIES MODIFY
+	MASTER MEDIAN MERGE MISSING MODIFIES MODIFY
 
 	NEWLINE NOCREATEEXTTABLE NOOVERCOMMIT
 
-	OPTIONS ORDERED OTHERS OVER OVERCOMMIT
+	ORDERED OTHERS OVER OVERCOMMIT
 
 	PARTITION PARTITIONS PASSING PERCENT PERCENTILE_CONT PERCENTILE_DISC
 	PRECEDING PROTOCOL
@@ -600,7 +600,7 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 	RANDOMLY RANGE READABLE READS RECURSIVE REF REJECT_P RESOURCE
 	ROLLUP ROOTPARTITION
 
-	SCATTER SEGMENT SERVER SETS SPLIT SQL SUBPARTITION SUBPARTITIONS
+	SCATTER SEGMENT SETS SPLIT SQL SUBPARTITION SUBPARTITIONS
 
 	THRESHOLD TIES
 
@@ -608,7 +608,7 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 
 	VALIDATION VARIADIC
 
-	WEB WINDOW WITHIN WRAPPER WRITABLE
+	WEB WINDOW WITHIN WRITABLE
 
 	XMLEXISTS
 
@@ -736,7 +736,6 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 			%nonassoc FIRST_P
 			%nonassoc FORCE
 			%nonassoc FORMAT
-			%nonassoc FORMATTER
 			%nonassoc FORWARD
 			%nonassoc FUNCTION
 			%nonassoc GLOBAL
@@ -782,7 +781,6 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 			%nonassoc MERGE
 			%nonassoc MINUTE_P
 			%nonassoc MINVALUE
-			%nonassoc MIRROR
 			%nonassoc MISSING
 			%nonassoc MODE
 			%nonassoc MODIFIES
@@ -810,7 +808,6 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 			%nonassoc OF
 			%nonassoc OIDS
 			%nonassoc OPTION
-			%nonassoc OPTIONS
 			%nonassoc OTHERS
 			%nonassoc OVER
 			%nonassoc OVERCOMMIT
@@ -861,7 +858,6 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 			%nonassoc SEGMENT
 			%nonassoc SEQUENCE
 			%nonassoc SERIALIZABLE
-			%nonassoc SERVER
 			%nonassoc SESSION
 			%nonassoc SHARE
 			%nonassoc SHOW
@@ -911,7 +907,6 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 			%nonassoc WITHIN
 			%nonassoc WITHOUT
 			%nonassoc WORK
-			%nonassoc WRAPPER
 			%nonassoc WRITABLE
 			%nonassoc WRITE
 			%nonassoc YEAR_P
@@ -12722,7 +12717,6 @@ unreserved_keyword:
 			| FIRST_P
 			| FORCE
 			| FORMAT
-			| FORMATTER
 			| FORWARD
 			| FUNCTION
 			| GLOBAL
@@ -12772,7 +12766,6 @@ unreserved_keyword:
 			| MERGE
 			| MINUTE_P
 			| MINVALUE
-			| MIRROR
 			| MISSING
 			| MODE
 			| MODIFIES
@@ -12801,7 +12794,6 @@ unreserved_keyword:
 			| OIDS
 			| OPERATOR
 			| OPTION
-			| OPTIONS
 			| ORDERED
 			| OTHERS
 			| OVER
@@ -12860,7 +12852,6 @@ unreserved_keyword:
 			| SEGMENT
 			| SEQUENCE
 			| SERIALIZABLE
-			| SERVER
 			| SESSION
 			| SET
 			| SHARE
@@ -12913,7 +12904,6 @@ unreserved_keyword:
 			| WITHIN
 			| WITHOUT
 			| WORK
-			| WRAPPER
 			| WRITABLE
 			| WRITE
 			| XML_P
@@ -13022,7 +13012,6 @@ PartitionIdentKeyword: ABORT_P
 			| FIRST_P
 			| FORCE
 			| FORMAT
-			| FORMATTER
 			| FORWARD
 			| FUNCTION
 			| GLOBAL
@@ -13066,7 +13055,6 @@ PartitionIdentKeyword: ABORT_P
 			| MAXVALUE
 			| MERGE
 			| MINVALUE
-			| MIRROR
 			| MISSING
 			| MODE
 			| MODIFIES
diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h
index 17197931d2d4c4530d9834a2a9d1424b938a0112..889ca267b40d22feed93eafa93c858b15b64e421 100644
--- a/src/include/parser/kwlist.h
+++ b/src/include/parser/kwlist.h
@@ -176,7 +176,6 @@ PG_KEYWORD("for", FOR, RESERVED_KEYWORD)
 PG_KEYWORD("force", FORCE, UNRESERVED_KEYWORD)
 PG_KEYWORD("foreign", FOREIGN, RESERVED_KEYWORD)
 PG_KEYWORD("format", FORMAT, UNRESERVED_KEYWORD)
-PG_KEYWORD("formatter", FORMATTER, UNRESERVED_KEYWORD)
 PG_KEYWORD("forward", FORWARD, UNRESERVED_KEYWORD)
 PG_KEYWORD("freeze", FREEZE, TYPE_FUNC_NAME_KEYWORD)
 PG_KEYWORD("from", FROM, RESERVED_KEYWORD)
@@ -259,7 +258,6 @@ PG_KEYWORD("median", MEDIAN, COL_NAME_KEYWORD)
 PG_KEYWORD("merge", MERGE, UNRESERVED_KEYWORD)        /* GPDB */
 PG_KEYWORD("minute", MINUTE_P, UNRESERVED_KEYWORD)
 PG_KEYWORD("minvalue", MINVALUE, UNRESERVED_KEYWORD)
-PG_KEYWORD("mirror", MIRROR, UNRESERVED_KEYWORD)      /* GPDB */
 PG_KEYWORD("missing", MISSING, UNRESERVED_KEYWORD)
 PG_KEYWORD("mode", MODE, UNRESERVED_KEYWORD)
 PG_KEYWORD("modifies", MODIFIES, UNRESERVED_KEYWORD)
@@ -303,7 +301,6 @@ PG_KEYWORD("on", ON, RESERVED_KEYWORD)
 PG_KEYWORD("only", ONLY, RESERVED_KEYWORD)
 PG_KEYWORD("operator", OPERATOR, UNRESERVED_KEYWORD)
 PG_KEYWORD("option", OPTION, UNRESERVED_KEYWORD)
-PG_KEYWORD("options", OPTIONS, UNRESERVED_KEYWORD)
 PG_KEYWORD("or", OR, RESERVED_KEYWORD)
 PG_KEYWORD("order", ORDER, RESERVED_KEYWORD)
 PG_KEYWORD("ordered", ORDERED, UNRESERVED_KEYWORD)
@@ -386,7 +383,6 @@ PG_KEYWORD("segment", SEGMENT, UNRESERVED_KEYWORD)
 PG_KEYWORD("select", SELECT, RESERVED_KEYWORD)
 PG_KEYWORD("sequence", SEQUENCE, UNRESERVED_KEYWORD)
 PG_KEYWORD("serializable", SERIALIZABLE, UNRESERVED_KEYWORD)
-PG_KEYWORD("server", SERVER, UNRESERVED_KEYWORD)
 PG_KEYWORD("session", SESSION, UNRESERVED_KEYWORD)
 PG_KEYWORD("session_user", SESSION_USER, RESERVED_KEYWORD)
 PG_KEYWORD("set", SET, UNRESERVED_KEYWORD)
@@ -471,7 +467,6 @@ PG_KEYWORD("with", WITH, RESERVED_KEYWORD)
 PG_KEYWORD("within", WITHIN, UNRESERVED_KEYWORD)
 PG_KEYWORD("without", WITHOUT, UNRESERVED_KEYWORD)
 PG_KEYWORD("work", WORK, UNRESERVED_KEYWORD)
-PG_KEYWORD("wrapper", WRAPPER, UNRESERVED_KEYWORD)
 PG_KEYWORD("writable", WRITABLE, UNRESERVED_KEYWORD)
 PG_KEYWORD("write", WRITE, UNRESERVED_KEYWORD)
 PG_KEYWORD("xml", XML_P, UNRESERVED_KEYWORD)