From 3fb57aa30ffffde7c261a81676c66fcb5404b8dd Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Thu, 29 Nov 2018 15:33:34 +0100
Subject: [PATCH] cleanup code

---
 pype/ftrack/credentials.py                      |  1 -
 pype/plugins/ftrack/collect_ftrack_api.py       | 14 --------------
 .../ftrack/integrate_ftrack_instances.py        | 17 +++++++++--------
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/pype/ftrack/credentials.py b/pype/ftrack/credentials.py
index b144d229f4..3efad41997 100644
--- a/pype/ftrack/credentials.py
+++ b/pype/ftrack/credentials.py
@@ -49,7 +49,6 @@ def _clear_credentials():
 def _set_env(username, apiKey):
     os.environ['FTRACK_API_USER'] = username
     os.environ['FTRACK_API_KEY'] = apiKey
-    os.environ['FTRACK_APIKEY'] = apiKey
 
 def _check_credentials(username=None, apiKey=None):
 
diff --git a/pype/plugins/ftrack/collect_ftrack_api.py b/pype/plugins/ftrack/collect_ftrack_api.py
index 4e48491686..ce83652e9c 100644
--- a/pype/plugins/ftrack/collect_ftrack_api.py
+++ b/pype/plugins/ftrack/collect_ftrack_api.py
@@ -1,9 +1,6 @@
 import os
-import json
-import base64
 
 import ftrack_api_old as ftrack_api
-reload(ftrack_api)
 import pyblish.api
 
 
@@ -22,15 +19,4 @@ class CollectFtrackApi(pyblish.api.ContextPlugin):
         # Collect task
         task_id = os.environ.get("FTRACK_TASKID", "")
 
-        try:
-            decoded_event_data = json.loads(
-                base64.b64decode(
-                    os.environ.get("FTRACK_CONNECT_EVENT")
-                )
-            )
-
-            task_id = decoded_event_data.get("selection")[0]["entityId"]
-        except:
-            pass
-
         context.data["ftrackTask"] = session.get("Task", task_id)
diff --git a/pype/plugins/ftrack/integrate_ftrack_instances.py b/pype/plugins/ftrack/integrate_ftrack_instances.py
index 8e93340f2a..62ad7d1a18 100644
--- a/pype/plugins/ftrack/integrate_ftrack_instances.py
+++ b/pype/plugins/ftrack/integrate_ftrack_instances.py
@@ -12,14 +12,15 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
     order = pyblish.api.IntegratorOrder + 0.48
     label = 'Integrate Ftrack Component'
 
-    family_mapping = {  'camera': 'cam',
-                        'look': 'look',
-                        'mayaAscii':'scene',
-                        'model':'geo',
-                        'rig':'rig',
-                        'setdress':'setdress',
-                        'pointcache':'cache',
-                        'review':'mov'}
+    family_mapping = {'camera': 'cam',
+                      'look': 'look',
+                      'mayaAscii': 'scene',
+                      'model': 'geo',
+                      'rig': 'rig',
+                      'setdress': 'setdress',
+                      'pointcache': 'cache',
+                      'review': 'mov'}
+
 
     def process(self, instance):