diff --git a/pype/plugins/global/publish/submit_publish_job.py b/pype/plugins/global/publish/submit_publish_job.py
index e4a674dc65..6b6cdfadf2 100644
--- a/pype/plugins/global/publish/submit_publish_job.py
+++ b/pype/plugins/global/publish/submit_publish_job.py
@@ -133,14 +133,14 @@ class SubmitDependentImageSequenceJobDeadline(pyblish.api.InstancePlugin):
 
     def process(self, instance):
 
-        # AVALON_DEADLINE = api.Session.get("AVALON_DEADLINE",
-        #                                   "http://localhost:8082")
-        # assert AVALON_DEADLINE, "Requires AVALON_DEADLINE"
+        AVALON_DEADLINE = api.Session.get("AVALON_DEADLINE",
+                                          "http://localhost:8082")
+        assert AVALON_DEADLINE, "Requires AVALON_DEADLINE"
 
-        try:
-            deadline_url = os.environ["DEADLINE_REST_URL"]
-        except KeyError:
-            self.log.error("Deadline REST API url not found.")
+        # try:
+        #     deadline_url = os.environ["DEADLINE_REST_URL"]
+        # except KeyError:
+        #     self.log.error("Deadline REST API url not found.")
 
         # Get a submission job
         job = instance.data.get("deadlineSubmissionJob")
diff --git a/pype/plugins/maya/create/create_renderglobals.py b/pype/plugins/maya/create/create_renderglobals.py
index 81850fe830..2ecc6cd0cd 100644
--- a/pype/plugins/maya/create/create_renderglobals.py
+++ b/pype/plugins/maya/create/create_renderglobals.py
@@ -4,8 +4,8 @@ import pype.maya.lib as lib
 
 from avalon.vendor import requests
 import avalon.maya
-from avalon import api
-
+# from avalon import api
+import os
 
 class CreateRenderGlobals(avalon.maya.Creator):
 
@@ -21,7 +21,7 @@ class CreateRenderGlobals(avalon.maya.Creator):
 
         # Get available Deadline pools
         try:
-            deadline_url = os.environ["DEADLINE_REST_URL"]
+            AVALON_DEADLINE = os.environ["AVALON_DEADLINE"]
         except KeyError:
             self.log.error("Deadline REST API url not found.")
 
@@ -34,9 +34,9 @@ class CreateRenderGlobals(avalon.maya.Creator):
             pools = response.json()
 
         # We don't need subset or asset attributes
-        self.data.pop("subset", None)
-        self.data.pop("asset", None)
-        self.data.pop("active", None)
+        # self.data.pop("subset", None)
+        # self.data.pop("asset", None)
+        # self.data.pop("active", None)
 
         self.data["suspendPublishJob"] = False
         self.data["extendFrames"] = False
diff --git a/pype/plugins/maya/publish/validate_deadline_connection.py b/pype/plugins/maya/publish/validate_deadline_connection.py
index 9052088d58..66ae32f024 100644
--- a/pype/plugins/maya/publish/validate_deadline_connection.py
+++ b/pype/plugins/maya/publish/validate_deadline_connection.py
@@ -3,7 +3,7 @@ import pyblish.api
 import avalon.api as api
 from avalon.vendor import requests
 from pype.plugin import contextplugin_should_run
-
+import os
 
 class ValidateDeadlineConnection(pyblish.api.ContextPlugin):
     """Validate Deadline Web Service is running"""
@@ -20,7 +20,7 @@ class ValidateDeadlineConnection(pyblish.api.ContextPlugin):
             return
 
         try:
-            deadline_url = os.environ["DEADLINE_REST_URL"]
+            AVALON_DEADLINE = os.environ["AVALON_DEADLINE"]
         except KeyError:
             self.log.error("Deadline REST API url not found.")