diff --git a/src/backend/columnar/columnar_tableam.c b/src/backend/columnar/columnar_tableam.c
index 775e08469..4a3ce8387 100644
--- a/src/backend/columnar/columnar_tableam.c
+++ b/src/backend/columnar/columnar_tableam.c
@@ -3000,7 +3000,7 @@ InstalledExtensionVersionColumnar(void)
 		}
 
 
-		installedExtensionVersion = text_to_cstring(DatumGetTextPCopy(installedVersion));
+		installedExtensionVersion = text_to_cstring(DatumGetTextPP(installedVersion));
 	}
 	else
 	{
diff --git a/src/backend/distributed/commands/domain.c b/src/backend/distributed/commands/domain.c
index bc9bb4872..c75af0024 100644
--- a/src/backend/distributed/commands/domain.c
+++ b/src/backend/distributed/commands/domain.c
@@ -175,7 +175,7 @@ RecreateDomainStmt(Oid domainOid)
 		 *
 		 * There is no supported way to go from a cooked expression to a raw expression.
 		 */
-		constraint->cooked_expr = text_to_cstring(DatumGetTextPCopy(conbin));
+		constraint->cooked_expr = TextDatumGetCString(conbin);
 
 		stmt->constraints = lappend(stmt->constraints, constraint);
 	}
diff --git a/src/backend/distributed/commands/role.c b/src/backend/distributed/commands/role.c
index 1def2fe0e..608dc0060 100644
--- a/src/backend/distributed/commands/role.c
+++ b/src/backend/distributed/commands/role.c
@@ -337,7 +337,6 @@ ExtractEncryptedPassword(Oid roleOid)
 
 	Datum passwordDatum = heap_getattr(tuple, Anum_pg_authid_rolpassword,
 									   pgAuthIdDescription, &isNull);
-	char *passwordCstring = text_to_cstring(DatumGetTextPCopy(passwordDatum));
 
 	table_close(pgAuthId, AccessShareLock);
 	ReleaseSysCache(tuple);
@@ -347,7 +346,7 @@ ExtractEncryptedPassword(Oid roleOid)
 		return NULL;
 	}
 
-	return pstrdup(passwordCstring);
+	return pstrdup(TextDatumGetCString(passwordDatum));
 }
 
 
@@ -399,7 +398,7 @@ GenerateAlterRoleSetIfExistsCommandList(HeapTuple tuple,
 	 */
 	for (i = 0; i < nconfigs; i++)
 	{
-		char *config = text_to_cstring(DatumGetTextPCopy(configs[i]));
+		char *config = TextDatumGetCString(configs[i]);
 		stmt->setstmt = MakeVariableSetStmt(config);
 		commandList = lappend(commandList,
 							  (void *) CreateAlterRoleSetIfExistsCommand(stmt));
diff --git a/src/backend/distributed/commands/text_search.c b/src/backend/distributed/commands/text_search.c
index 688b56774..05319324d 100644
--- a/src/backend/distributed/commands/text_search.c
+++ b/src/backend/distributed/commands/text_search.c
@@ -207,7 +207,6 @@ GetTextSearchDictionaryInitOptions(HeapTuple tup, Form_pg_ts_dict dict)
 	List *initOptionDefElemList = NIL;
 	if (!isnull)
 	{
-		/* TODO: might need copying */
 		initOptionDefElemList = deserialize_deflist(dictinitoption);
 	}
 
diff --git a/src/backend/distributed/deparser/citus_ruleutils.c b/src/backend/distributed/deparser/citus_ruleutils.c
index 13f8ac90b..ff8da5991 100644
--- a/src/backend/distributed/deparser/citus_ruleutils.c
+++ b/src/backend/distributed/deparser/citus_ruleutils.c
@@ -152,7 +152,7 @@ get_extension_version(Oid extensionId)
 										  RelationGetDescr(relation), &isNull);
 		if (!isNull)
 		{
-			versionName = text_to_cstring(DatumGetTextPCopy(versionDatum));
+			versionName = text_to_cstring(DatumGetTextPP(versionDatum));
 		}
 	}
 
diff --git a/src/backend/distributed/metadata/metadata_cache.c b/src/backend/distributed/metadata/metadata_cache.c
index d07286649..1d4e01a8c 100644
--- a/src/backend/distributed/metadata/metadata_cache.c
+++ b/src/backend/distributed/metadata/metadata_cache.c
@@ -67,7 +67,6 @@
 #include "utils/datum.h"
 #include "utils/elog.h"
 #include "utils/hsearch.h"
-#include "utils/jsonb.h"
 #if PG_VERSION_NUM >= PG_VERSION_13
 #include "common/hashfn.h"
 #endif
@@ -2250,7 +2249,7 @@ InstalledExtensionVersion(void)
 		MemoryContext oldMemoryContext = MemoryContextSwitchTo(
 			MetadataCacheMemoryContext);
 
-		installedExtensionVersion = text_to_cstring(DatumGetTextPCopy(installedVersion));
+		installedExtensionVersion = text_to_cstring(DatumGetTextPP(installedVersion));
 
 		MemoryContextSwitchTo(oldMemoryContext);
 	}
@@ -4884,10 +4883,6 @@ DistNodeMetadata(void)
 							"could not find any entries in pg_dist_metadata")));
 	}
 
-	/* copy the jsonb result before closing the table */
-	/* since that memory can be freed */
-	metadata = JsonbPGetDatum(DatumGetJsonbPCopy(metadata));
-
 	systable_endscan(scanDescriptor);
 	table_close(pgDistNodeMetadata, AccessShareLock);
 
diff --git a/src/backend/distributed/planner/multi_explain.c b/src/backend/distributed/planner/multi_explain.c
index 8ff1be0bb..4c6370e5a 100644
--- a/src/backend/distributed/planner/multi_explain.c
+++ b/src/backend/distributed/planner/multi_explain.c
@@ -1286,7 +1286,6 @@ ExplainAnalyzeDestPutTuple(TupleDestination *self, Task *task,
 			return;
 		}
 
-		/* TODO: might need copying */
 		char *fetchedExplainAnalyzePlan = TextDatumGetCString(explainAnalyze);
 		double fetchedExplainAnalyzeExecutionDuration = DatumGetFloat8(executionDuration);