--- a/src/hotspot/share/jfr/metadata/metadata.xml	Sat Aug 24 14:30:27 2019 +0200
+++ b/src/hotspot/share/jfr/metadata/metadata.xml	Sun Aug 25 10:12:57 2019 +0200
@@ -1019,27 +1019,6 @@
     <Field type="ulong" contentType="bytes" name="size" label="Size Written" />
   </Event>
 
-  <Event name="ShenandoahHeapRegionStateChange" category="Java Virtual Machine, GC, Detailed" label="Shenandoah Heap Region State Change" description="Information about a Shenandoah heap region state change"
-    startTime="false">
-    <Field type="uint" name="index" label="Index" />
-    <Field type="ShenandoahHeapRegionState" name="from" label="From" />
-    <Field type="ShenandoahHeapRegionState" name="to" label="To" />
-    <Field type="ulong" contentType="address" name="start" label="Start" />
-    <Field type="ulong" contentType="bytes" name="used" label="Used" />
-  </Event>
-
-  <Event name="ShenandoahHeapRegionInformation" category="Java Virtual Machine, GC, Detailed" label="Shenandoah Heap Region Information" description="Information about a specific heap region in the Shenandoah GC"
-    period="everyChunk">
-    <Field type="uint" name="index" label="Index" />
-    <Field type="ShenandoahHeapRegionState" name="state" label="State" />
-    <Field type="ulong" contentType="address" name="start" label="Start" />
-    <Field type="ulong" contentType="bytes" name="used" label="Used" />
-  </Event>
-
-  <Type name="ShenandoahHeapRegionState" label="Shenandoah Heap Region State">
-    <Field type="string" name="state" label="State" />
-  </Type>
-
   <Type name="ZStatisticsCounterType" label="Z Statistics Counter">
     <Field type="string" name="counter" label="Counter" />
   </Type>

--- a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp	Sat Aug 24 14:30:27 2019 +0200
+++ b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp	Sun Aug 25 10:12:57 2019 +0200
@@ -65,9 +65,7 @@
 #include "services/threadService.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
-#if INCLUDE_SHENANDOAHGC
-#include "gc/shenandoah/shenandoahJfrSupport.hpp"
-#endif
+
 /**
  *  JfrPeriodic class
  *  Implementation of declarations in
@@ -631,14 +629,3 @@
   event.set_flushingEnabled(UseCodeCacheFlushing);
   event.commit();
 }
-
-
-TRACE_REQUEST_FUNC(ShenandoahHeapRegionInformation) {
-#if INCLUDE_SHENANDOAHGC
-  if (UseShenandoahGC) {
-    VM_ShenandoahSendHeapRegionInfoEvents op;
-    VMThread::execute(&op);
-  }
-#endif
-}
-