diff --git a/src/backend/distributed/commands/create_distributed_table.c b/src/backend/distributed/commands/create_distributed_table.c
index 387d05ab5..5cb842353 100644
--- a/src/backend/distributed/commands/create_distributed_table.c
+++ b/src/backend/distributed/commands/create_distributed_table.c
@@ -450,10 +450,11 @@ CreateDistributedTable(Oid relationId, Var *distributionColumn, char distributio
 	ObjectAddressSet(tableAddress, RelationRelationId, relationId);
 	EnsureDependenciesExistOnAllNodes(&tableAddress);
 
+	CreateShellTableOnWorkers(relationId);
+
 	/* TODO: Consider partitioned tables */
-	if (ShouldSyncTableMetadata(relationId))
+	if (EnableDependencyCreation)
 	{
-		CreateShellTableOnWorkers(relationId);
 		MarkObjectDistributed(&tableAddress);
 	}
 
diff --git a/src/backend/distributed/connection/connection_management.c b/src/backend/distributed/connection/connection_management.c
index cc05bbaa4..dc53cdda5 100644
--- a/src/backend/distributed/connection/connection_management.c
+++ b/src/backend/distributed/connection/connection_management.c
@@ -1459,8 +1459,6 @@ ShouldShutdownConnection(MultiConnection *connection, const int cachedConnection
 bool
 IsCitusInitiatedRemoteBackend(void)
 {
-	elog(WARNING, "IsCitusInitiatedRemoteBackend");
-	elog(WARNING, "Application name is %s", application_name);
 	return application_name && strcmp(application_name, CITUS_APPLICATION_NAME) == 0;
 }
 
diff --git a/src/backend/distributed/metadata/dependency.c b/src/backend/distributed/metadata/dependency.c
index 23981a747..6e5b7702a 100644
--- a/src/backend/distributed/metadata/dependency.c
+++ b/src/backend/distributed/metadata/dependency.c
@@ -676,7 +676,7 @@ SupportedDependencyByCitus(const ObjectAddress *address)
 			 * for tables.
 			 */
 			if (relKind == RELKIND_COMPOSITE_TYPE ||
-				(relKind == RELKIND_RELATION && IsCitusTable(address->objectId)) ||
+				relKind == RELKIND_RELATION || // TODO: Should check for normal tables?
 				relKind == RELKIND_SEQUENCE)
 			{
 				return true;
diff --git a/src/backend/distributed/metadata/metadata_sync.c b/src/backend/distributed/metadata/metadata_sync.c
index 87dd6556b..c4db122b9 100644
--- a/src/backend/distributed/metadata/metadata_sync.c
+++ b/src/backend/distributed/metadata/metadata_sync.c
@@ -538,9 +538,8 @@ MetadataCreateCommands(void)
 
 /*
  * GetDistributedTableMetadataEvents returns the full set of DDL commands necessary to
- * create the given distributed table on a worker. The list includes setting up any
- * sequences, setting the owner of the table, inserting table and shard metadata,
- * setting the truncate trigger and foreign key constraints.
+ * create the given distributed table metadata on a worker. The list includes setting up
+ * any shard metadata, setting the truncate trigger and foreign key constraints.
  */
 static List *
 GetDistributedTableMetadataEvents(Oid relationId)