diff --git a/client/src/com/mirth/connect/client/ui/OSXAdapter.java b/client/src/com/mirth/connect/client/ui/OSXAdapter.java
index 6faea2f85b..e38721c761 100644
--- a/client/src/com/mirth/connect/client/ui/OSXAdapter.java
+++ b/client/src/com/mirth/connect/client/ui/OSXAdapter.java
@@ -52,11 +52,9 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.security.AccessController;
 import java.util.List;
 
 import org.apache.commons.lang3.math.NumberUtils;
-import org.glassfish.jersey.internal.util.ReflectionHelper;
 
 public class OSXAdapter implements InvocationHandler {
 
@@ -280,7 +278,7 @@ protected static Object getApplication() throws Exception {
 
     protected static void setHandler(InvocationHandler adapter, String interfaceName, String applicationSetter) throws Exception {
         Class<?> handlerInterface = Class.forName(interfaceName);
-        Object handlerImpl = Proxy.newProxyInstance(AccessController.doPrivileged(ReflectionHelper.getClassLoaderPA(handlerInterface)), new Class[] {
+        Object handlerImpl = Proxy.newProxyInstance(handlerInterface.getClassLoader(), new Class[] {
                 handlerInterface }, adapter);
         Object application = getApplication();
         application.getClass().getMethod(applicationSetter, handlerInterface).invoke(application, handlerImpl);
diff --git a/client/src/com/mirth/connect/client/ui/panels/connectors/ConnectorSettingsPanel.java b/client/src/com/mirth/connect/client/ui/panels/connectors/ConnectorSettingsPanel.java
index e035c42433..8ec8c945fb 100644
--- a/client/src/com/mirth/connect/client/ui/panels/connectors/ConnectorSettingsPanel.java
+++ b/client/src/com/mirth/connect/client/ui/panels/connectors/ConnectorSettingsPanel.java
@@ -13,7 +13,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.security.AccessController;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -23,8 +22,6 @@
 import javax.swing.JPanel;
 import javax.swing.SwingWorker;
 
-import org.glassfish.jersey.internal.util.ReflectionHelper;
-
 import com.mirth.connect.client.core.ClientException;
 import com.mirth.connect.client.ui.ConnectorTypeDecoration;
 import com.mirth.connect.client.ui.PlatformUI;
@@ -199,7 +196,7 @@ public final <T> T getServlet(final Class<T> servletInterface, final String work
      */
     @SuppressWarnings("unchecked")
     public final <T> T getServlet(final Class<T> servletInterface, final String workerDisplayText, final String errorText, final ResponseHandler responseHandler, final String workerId) {
-        return (T) Proxy.newProxyInstance(AccessController.doPrivileged(ReflectionHelper.getClassLoaderPA(servletInterface)), new Class[] {
+        return (T) Proxy.newProxyInstance(servletInterface.getClassLoader(), new Class[] {
                 servletInterface }, new InvocationHandler() {
                     @Override
                     public Object invoke(final Object proxy, final Method method, final Object[] args) throws ClientException {
diff --git a/server/src/com/mirth/connect/client/core/Client.java b/server/src/com/mirth/connect/client/core/Client.java
index a0ba3f57bb..4690e1151b 100644
--- a/server/src/com/mirth/connect/client/core/Client.java
+++ b/server/src/com/mirth/connect/client/core/Client.java
@@ -19,7 +19,6 @@
 import java.lang.reflect.Proxy;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.security.AccessController;
 import java.security.Provider;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -51,7 +50,6 @@
 import org.glassfish.jersey.client.proxy.WebResourceFactory;
 import org.glassfish.jersey.client.spi.Connector;
 import org.glassfish.jersey.client.spi.ConnectorProvider;
-import org.glassfish.jersey.internal.util.ReflectionHelper;
 import org.glassfish.jersey.media.multipart.MultiPartFeature;
 import org.reflections.Reflections;
 
@@ -245,7 +243,7 @@ public <T> T getServlet(Class<T> servletInterface, ExecuteType executeType) {
 
     @SuppressWarnings("unchecked")
     public <T> T getServlet(final Class<T> servletInterface, final ExecuteType executeType, final Map<String, List<String>> customHeaders) {
-        return (T) Proxy.newProxyInstance(AccessController.doPrivileged(ReflectionHelper.getClassLoaderPA(servletInterface)), new Class[] {
+        return (T) Proxy.newProxyInstance(servletInterface.getClassLoader(), new Class[] {
                 servletInterface }, new InvocationHandler() {
                     @Override
                     public Object invoke(Object proxy, Method method, Object[] args) throws ClientException {
diff --git a/server/src/com/mirth/connect/server/util/javascript/MirthJavaScriptThreadFactory.java b/server/src/com/mirth/connect/server/util/javascript/MirthJavaScriptThreadFactory.java
index f9e58d22ba..1e45e72f7f 100644
--- a/server/src/com/mirth/connect/server/util/javascript/MirthJavaScriptThreadFactory.java
+++ b/server/src/com/mirth/connect/server/util/javascript/MirthJavaScriptThreadFactory.java
@@ -19,8 +19,7 @@ public class MirthJavaScriptThreadFactory implements ThreadFactory {
     private final String namePrefix;
 
     MirthJavaScriptThreadFactory() {
-        SecurityManager securityManager = System.getSecurityManager();
-        group = (securityManager != null) ? securityManager.getThreadGroup() : Thread.currentThread().getThreadGroup();
+        group = Thread.currentThread().getThreadGroup();
         namePrefix = "pool-" + poolNumber.getAndIncrement() + "-thread-";
     }
 
diff --git a/server/src/org/glassfish/jersey/client/proxy/WebResourceFactory.java b/server/src/org/glassfish/jersey/client/proxy/WebResourceFactory.java
index 2107225521..87c64e5421 100644
--- a/server/src/org/glassfish/jersey/client/proxy/WebResourceFactory.java
+++ b/server/src/org/glassfish/jersey/client/proxy/WebResourceFactory.java
@@ -50,7 +50,6 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Proxy;
 import java.lang.reflect.Type;
-import java.security.AccessController;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -82,7 +81,6 @@
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
 
-import org.glassfish.jersey.internal.util.ReflectionHelper;
 import org.glassfish.jersey.media.multipart.Boundary;
 import org.glassfish.jersey.media.multipart.FormDataMultiPart;
 import org.glassfish.jersey.media.multipart.FormDataParam;
@@ -148,7 +146,7 @@ public static <C> C newResource(final Class<C> resourceInterface,
                                     final List<Cookie> cookies,
                                     final Form form) {
 
-        return (C) Proxy.newProxyInstance(AccessController.doPrivileged(ReflectionHelper.getClassLoaderPA(resourceInterface)),
+        return (C) Proxy.newProxyInstance(resourceInterface.getClassLoader(),
                 new Class[] {resourceInterface},
                 new WebResourceFactory(ignoreResourcePath ? target : addPathFromAnnotation(resourceInterface, target),
                         headers, cookies, form));