diff --git a/boomi-custom-atom-extension-nr.xml b/boomi-custom-atom-extension-nr.xml
index 1c8f0d2..4877f7c 100644
--- a/boomi-custom-atom-extension-nr.xml
+++ b/boomi-custom-atom-extension-nr.xml
@@ -1,88 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension xmlns="https://newrelic.com/docs/java/xsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="newrelic-extension extension.xsd" name="boomi-custom-atom-extension-nr" version="1.0" enabled="true">
-  <instrumentation>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.util.ExecutorUtil$CCLRunnable</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.util.ExecutorUtil$NamedRunnable</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.execution.ExecutionManager$2</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut>
-      <nameTransaction/>
-      <className>com.boomi.execution.ExecutionManager</className>
-      <method>
-        <name>access$100</name>
-        <parameters>
-          <type>com.boomi.execution.ExecutionManager</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.execution.ExecutionManager</className>
-      <method>
-        <name>runMaintenanceTasks</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.container.cloudlet.execution.ClusterExecutionForker</className>
-      <method>
-        <name>runMaintenanceTasks</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.execution.forker.MultiProcessExecutionForker</className>
-      <method>
-        <name>runMaintenanceTasks</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.execution.forker.worker.WorkerPool$4</className>
-      <method>
-        <name>execute</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.util.retry.Retryable</className>
-      <method>
-        <name>call</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>org.jgroups.util.TimeScheduler3$RecurringTask</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
     <pointcut transactionStartPoint="true">
       <nameTransaction/>
       <className>com.boomi.message.SendMessageTask</className>
@@ -114,54 +31,6 @@
         </parameters>
       </method>
     </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.queue.BaseStoreMessageTask</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>org.jgroups.protocols.UDP$PacketReceiver</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>org.jgroups.protocols.TP$TransferQueueBundler</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.util.InternedObjectManager$1</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>org.jgroups.stack.DiagnosticsHandler</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.container.core.MessagePollerThread</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
     <pointcut transactionStartPoint="true">
       <nameTransaction/>
       <className>org.restlet.Uniform</className>
@@ -172,90 +41,5 @@
         </parameters>
       </method>
     </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>org.jgroups.protocols.FD_SOCK$ServerSocketHandler</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>org.apache.activemq.transport.tcp.TcpTransportServer</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>org.jgroups.util.TimeScheduler3</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>org.apache.activemq.transport.tcp.TcpTransportServer$1</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.connector.server.http.QueuedThreadPool$PoolThread</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.install4j.runtime.launcher.service.CommonHandler$StopWatcherThread</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>org.apache.activemq.store.kahadb.disk.journal.DataFileAppender$1</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>org.apache.activemq.store.kahadb.disk.journal.DataFileAppender</className>
-      <method>
-        <name>processQueue</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>sun.rmi.server.UnicastRef</className>
-      <method>
-        <name>invoke</name>
-        <parameters>
-          <type>java.rmi.Remote</type>
-          <type>java.lang.reflect.Method</type>
-          <type>java.lang.Object[]</type>
-          <type>long</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut>
-      <nameTransaction/>
-      <className>sun.rmi.transport.StreamRemoteCall</className>
-      <method>
-        <name>executeCall</name>
-        <parameters/>
-      </method>
-    </pointcut>
   </instrumentation>
 </extension>
diff --git a/boomi-custom-worker-extension-nr.xml b/boomi-custom-worker-extension-nr.xml
index d6eeffb..a916e2c 100644
--- a/boomi-custom-worker-extension-nr.xml
+++ b/boomi-custom-worker-extension-nr.xml
@@ -1,110 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension xmlns="https://newrelic.com/docs/java/xsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="newrelic-extension extension.xsd" name="boomi-custom-worker-extension-nr" version="1.0" enabled="true">
   <instrumentation>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.util.ExecutorUtil$CCLRunnable</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.util.ExecutorUtil$NamedRunnable</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.process.util.ProcessSummaryReportingService$2</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.process.util.ProcessSummaryReportingService</className>
-      <method>
-        <name>access$000</name>
-        <parameters>
-          <type>com.boomi.process.util.ProcessSummaryReportingService</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.process.util.ProcessSummaryReportingService</className>
-      <method>
-        <name>consumePendingResults</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.execution.ExecutionQueue$1</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.execution.ExecutionQueue</className>
-      <method>
-        <name>access$000</name>
-        <parameters>
-          <type>com.boomi.execution.ExecutionQueue</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.execution.ExecutionQueue</className>
-      <method>
-        <name>manageQueuedTasks</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.execution.ExecutionTask</className>
-      <method>
-        <name>call</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.util.InternedObjectManager$1</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.launcher.Launcher</className>
-      <method>
-        <name>main</name>
-        <parameters>
-          <type>java.lang.String[]</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.execution.forker.ProcessExecutionWorker</className>
-      <method>
-        <name>main</name>
-        <parameters>
-          <type>java.lang.String[]</type>
-        </parameters>
-      </method>
-    </pointcut>
     <pointcut transactionStartPoint="true">
       <nameTransaction/>
       <className>com.boomi.execution.forker.BaseProcessExecutionRunner</className>
@@ -123,65 +19,6 @@
         <parameters/>
       </method>
     </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.process.graph.ProcessGraph</className>
-      <method>
-        <name>execute</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.process.graph.ProcessGraph</className>
-      <method>
-        <name>executeNextShapes</name>
-        <parameters>
-          <type>com.boomi.process.graph.ProcessShape</type>
-          <type>boolean</type>
-          <type>boolean</type>
-          <type>com.boomi.store.ReadStore</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.process.shape.StartShape</className>
-      <method>
-        <name>execute</name>
-        <parameters>
-          <type>com.boomi.store.ReadStore</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.execution.ExecutionRecord</className>
-      <method>
-        <name>setEndTime</name>
-        <parameters>
-          <type>long</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.execution.ExecutionTask</className>
-      <method>
-        <name>close</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.execution.forker.BaseProcessExecutionWorker</className>
-      <method>
-        <name>sendHeartbeat</name>
-        <parameters>
-          <type>com.boomi.execution.forker.ForkerClient</type>
-        </parameters>
-      </method>
-    </pointcut>
     <pointcut transactionStartPoint="true">
       <nameTransaction/>
       <className>com.boomi.execution.forker.ForkerClient</className>
@@ -257,32 +94,6 @@
         <parameters/>
       </method>
     </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.logging.AsyncHandler$3</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.logging.AsyncHandler</className>
-      <method>
-        <name>access$200</name>
-        <parameters>
-          <type>com.boomi.logging.AsyncHandler</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.logging.AsyncHandler</className>
-      <method>
-        <name>publishAsync</name>
-        <parameters/>
-      </method>
-    </pointcut>
     <pointcut transactionStartPoint="true">
       <nameTransaction/>
       <className>com.boomi.execution.forker.RemoteWorker</className>
@@ -302,54 +113,6 @@
         <parameters/>
       </method>
     </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.util.management.CustomMBean</className>
-      <method>
-        <name>invoke</name>
-        <parameters>
-          <type>java.lang.String</type>
-          <type>java.lang.Object[]</type>
-          <type>java.lang.String[]</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.process.shape.MapShape</className>
-      <method>
-        <name>execute</name>
-        <parameters>
-          <type>com.boomi.store.ReadStore</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.dataparser.xml.XMLDataParser</className>
-      <method>
-        <name>doWrite</name>
-        <parameters>
-          <type>com.boomi.transform.data.DataNode</type>
-          <type>com.boomi.store.WriteStore</type>
-          <type>java.util.Collection</type>
-          <type>com.boomi.dataparser.ValidationHandler</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.dataparser.xml.XMLStreamFormatter</className>
-      <method>
-        <name>doWrite</name>
-        <parameters>
-          <type>com.boomi.transform.data.DataNode</type>
-          <type>com.boomi.store.WriteStore</type>
-          <type>java.util.Collection</type>
-          <type>com.boomi.dataparser.ValidationHandler</type>
-        </parameters>
-      </method>
-    </pointcut>
     <pointcut transactionStartPoint="true">
       <nameTransaction/>
       <className>com.boomi.store.impl.WriteStoreImpl</className>
@@ -372,83 +135,5 @@
         </parameters>
       </method>
     </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.process.logging.ProcessLogger</className>
-      <method>
-        <name>log</name>
-        <parameters>
-          <type>java.util.logging.LogRecord</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.process.logging.ProcessLogger</className>
-      <method>
-        <name>log</name>
-        <parameters>
-          <type>java.util.logging.LogRecord</type>
-          <type>java.lang.String</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.execution.ExecutionLogger</className>
-      <method>
-        <name>log</name>
-        <parameters>
-          <type>java.util.logging.LogRecord</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.process.graph.ProcessGraph</className>
-      <method>
-        <name>loadGraph</name>
-        <parameters>
-          <type>java.lang.String</type>
-          <type>com.boomi.model.process.Process</type>
-          <type>java.lang.String</type>
-          <type>java.lang.String</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.process.graph.ProcessGraph</className>
-      <method>
-        <name>loadShape</name>
-        <parameters>
-          <type>java.lang.String</type>
-          <type>java.util.Map</type>
-          <type>java.util.Map</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.track.TrackDocument</className>
-      <method>
-        <name>setDateField</name>
-        <parameters>
-          <type>java.lang.String</type>
-          <type>long</type>
-        </parameters>
-      </method>
-    </pointcut>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.track.TrackDocument</className>
-      <method>
-        <name>setEnumField</name>
-        <parameters>
-          <type>java.lang.String</type>
-          <type>java.lang.Enum</type>
-        </parameters>
-      </method>
-    </pointcut>
   </instrumentation>
 </extension>
diff --git a/extensions-boomi.xml b/extensions-boomi.xml
index 33b4ca5..9a68f09 100644
--- a/extensions-boomi.xml
+++ b/extensions-boomi.xml
@@ -5,13 +5,6 @@
 	version="1.0" enabled="true">
 	<instrumentation>
 
-		<!--Entry Point for all Executions-->
-		<pointcut transactionStartPoint="true">
-			<className>com.boomi.execution.ExecutionTask</className>
-			<method>
-				<name>call</name>
-			</method>
-		</pointcut>
 		<!--Removing StatusServlet Trace which is appering every second-->
 		<pointcut transactionStartPoint="false" excludeFromTransactionTrace="true" ignoreTransaction="true">
 			<nameTransaction />
diff --git a/nr-boomi-container.xml b/nr-boomi-container.xml
index 2f707da..a6b20ef 100644
--- a/nr-boomi-container.xml
+++ b/nr-boomi-container.xml
@@ -58,12 +58,5 @@
         </parameters>
       </method>
     </pointcut>
-    <pointcut>
-      <className>com.boomi.container.cloudlet.execution.ClusterWorkerCoordinator$1</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
   </instrumentation>
 </extension>
diff --git a/nr-boomi-process.xml b/nr-boomi-process.xml
index 868f57f..c90fcd6 100644
--- a/nr-boomi-process.xml
+++ b/nr-boomi-process.xml
@@ -10,11 +10,5 @@
         <parameters/>
       </method>
     </pointcut>
-    <pointcut transactionStartPoint="true">
-      <className>com.boomi.execution.ExecutionTask</className>
-      <method>
-       <name>call</name>
-      </method>
-    </pointcut>
   </instrumentation>
 </extension>
diff --git a/nr-boomi-util.xml b/nr-boomi-util.xml
index 10d4545..aecd441 100644
--- a/nr-boomi-util.xml
+++ b/nr-boomi-util.xml
@@ -2,14 +2,6 @@
 <extension xmlns="https://newrelic.com/docs/java/xsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="newrelic-extension extension.xsd" name="nr-boomi-util" version="1.0" enabled="true">
   <instrumentation>
-    <pointcut transactionStartPoint="true">
-      <nameTransaction/>
-      <className>com.boomi.util.concurrent.CancellableFutureTask</className>
-      <method>
-        <name>run</name>
-        <parameters/>
-      </method>
-    </pointcut>
     <pointcut>
       <className>com.boomi.util.ProgramExecUtility</className>
       <method>