diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 263177735..ecca6eca7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ hypertrace-grpc-client-utils ={ module = "org.hypertrace.core.grpcutils:grpc-cli
 hypertrace-grpc-client-rxUtils = { module = "org.hypertrace.core.grpcutils:grpc-client-rx-utils", version.ref = "hypertrace-grpc-utils"}
 hypertrace-serviceFramework-metrics = { module = "org.hypertrace.core.serviceframework:platform-metrics", version.ref = "hypertrace-serviceFramework" }
 hypertrace-serviceFramework-framework = { module = "org.hypertrace.core.serviceframework:platform-service-framework", version.ref = "hypertrace-serviceFramework" }
-hypertrace-data-model = { module ="org.hypertrace.core.datamodel:data-model", version = "0.1.27" }
+hypertrace-data-model = { module ="org.hypertrace.core.datamodel:data-model", version = "0.1.29-SNAPSHOT" }
 hypertrace-kafkaStreams-framework = { module = "org.hypertrace.core.kafkastreams.framework:kafka-streams-framework", version.ref = "hypertrace-kafkaStreams" }
 hypertrace-kafkaStreams-avroPartitioners = { module = "org.hypertrace.core.kafkastreams.framework:avro-partitioners", version.ref = "hypertrace-kafkaStreams" }
 hypertrace-kafkaStreams-weightedGroupPartitioners = { module = "org.hypertrace.core.kafkastreams.framework:weighted-group-partitioner", version.ref = "hypertrace-kafkaStreams" }
diff --git a/hypertrace-trace-enricher/hypertrace-trace-enricher-api/src/main/java/org/hypertrace/traceenricher/trace/util/StructuredTraceGraphBuilder.java b/hypertrace-trace-enricher/hypertrace-trace-enricher-api/src/main/java/org/hypertrace/traceenricher/trace/util/StructuredTraceGraphBuilder.java
index aac4f825c..738482404 100644
--- a/hypertrace-trace-enricher/hypertrace-trace-enricher-api/src/main/java/org/hypertrace/traceenricher/trace/util/StructuredTraceGraphBuilder.java
+++ b/hypertrace-trace-enricher/hypertrace-trace-enricher-api/src/main/java/org/hypertrace/traceenricher/trace/util/StructuredTraceGraphBuilder.java
@@ -56,41 +56,24 @@ public static StructuredTraceGraph buildGraph(StructuredTrace trace) {
 
   private static void debugGraph(
       String logPrefix, StructuredTraceGraph graph, StructuredTrace trace) {
-    if (null != graph
-        && (null == graph.getTraceEntitiesGraph() || null == graph.getTraceEventsGraph())) {
+    if (null != graph && null == graph.getTraceEventsGraph()) {
       LOG.info(
           logPrefix
               + "StructuredTraceGraph is not built correctly, trace {}, Is events graph non-null:"
-              + " {}."
-              + " Is entities graph non-null: {}",
+              + " {}.",
           trace,
-          (null != graph.getTraceEventsGraph()),
-          (null != graph.getTraceEntitiesGraph()));
+          (null != graph.getTraceEventsGraph()));
 
       // build the graph again and check
       StructuredTraceGraph tempGraph = new StructuredTraceGraph(trace);
       LOG.info(
-          logPrefix
-              + "Recreating StructuredTraceGraph. Is events graph non-null: {}."
-              + " Is entities graph non-null: {}",
-          (null != tempGraph.getTraceEventsGraph()),
-          (null != tempGraph.getTraceEntitiesGraph()));
+          logPrefix + "Recreating StructuredTraceGraph. Is events graph non-null: {}.",
+          (null != tempGraph.getTraceEventsGraph()));
 
       tempGraph.reCreateTraceEventsGraph(trace);
       LOG.info(
-          logPrefix
-              + "Recreating events graph. Is events graph non-null: {}."
-              + " Is entities graph non-null: {}",
-          (null != tempGraph.getTraceEventsGraph()),
-          (null != tempGraph.getTraceEntitiesGraph()));
-
-      tempGraph.reCreateTraceEntitiesGraph(trace);
-      LOG.info(
-          logPrefix
-              + "Recreating entities graph. Is events graph non-null: {}."
-              + " Is entities graph non-null: {}",
-          (null != tempGraph.getTraceEventsGraph()),
-          (null != tempGraph.getTraceEntitiesGraph()));
+          logPrefix + "Recreating events graph. Is events graph non-null: {}.",
+          (null != tempGraph.getTraceEventsGraph()));
     }
   }
 }