diff --git a/pype/ftrack/actions/action_create_cust_attrs.py b/pype/ftrack/actions/action_create_cust_attrs.py
index 8454d28d80..527f0daaf5 100644
--- a/pype/ftrack/actions/action_create_cust_attrs.py
+++ b/pype/ftrack/actions/action_create_cust_attrs.py
@@ -130,12 +130,11 @@ class CustomAttributes(BaseAction):
             'dynamic enumerator', 'number'
         ]
 
-    def discover(self, session, entities, event):
+    def prediscover(self, event):
         '''
         Validation
         - action is only for Administrators
         '''
-
         return True
 
     def launch(self, session, entities, event):
diff --git a/pype/ftrack/actions/action_create_folders.py b/pype/ftrack/actions/action_create_folders.py
index 49edb4f9c4..6ccb571dd9 100644
--- a/pype/ftrack/actions/action_create_folders.py
+++ b/pype/ftrack/actions/action_create_folders.py
@@ -26,13 +26,9 @@ class CreateFolders(BaseAction):
         '698620-icon-105-folder-add-512.png'
     )
 
-    def discover(self, session, entities, event):
+    def prediscover(self, event):
         ''' Validation '''
 
-        # if (len(entities) == 0 or entities[0].entity_type not in
-        #         ['Episode', 'Sequence', 'Shot', 'Folder', 'Asset Build']):
-        #     return False
-
         return True
 
     def getShotAsset(self, entity):
diff --git a/pype/ftrack/actions/action_delete_asset.py b/pype/ftrack/actions/action_delete_asset.py
index 3d9e3c53d9..f1d2941420 100644
--- a/pype/ftrack/actions/action_delete_asset.py
+++ b/pype/ftrack/actions/action_delete_asset.py
@@ -22,7 +22,7 @@ class DeleteAsset(BaseAction):
 
     value = None
 
-    def discover(self, session, entities, event):
+    def prediscover(self, event):
         ''' Validation '''
         selection = event["data"].get("selection", None)
         if selection is None or len(selection) > 1:
diff --git a/pype/ftrack/actions/action_delete_asset_byname.py b/pype/ftrack/actions/action_delete_asset_byname.py
index 1e5658dd9c..3b26854867 100644
--- a/pype/ftrack/actions/action_delete_asset_byname.py
+++ b/pype/ftrack/actions/action_delete_asset_byname.py
@@ -18,7 +18,7 @@ class AssetsRemover(BaseAction):
     #: Db
     db = DbConnector()
 
-    def discover(self, session, entities, event):
+    def prediscover(self, event):
         ''' Validation '''
         selection = event["data"].get("selection", None)
         if selection is None or len(selection) != 1:
diff --git a/pype/ftrack/actions/action_job_killer.py b/pype/ftrack/actions/action_job_killer.py
index 9ca63ff1dd..f4aa7b1816 100644
--- a/pype/ftrack/actions/action_job_killer.py
+++ b/pype/ftrack/actions/action_job_killer.py
@@ -18,7 +18,7 @@ class JobKiller(BaseAction):
     #: Action description.
     description = 'Killing all running jobs younger than day'
 
-    def discover(self, session, entities, event):
+    def prediscover(self, event):
         ''' Validation '''
 
         return True