diff --git a/openpype/hosts/tvpaint/api/communication_server.py b/openpype/hosts/tvpaint/api/communication_server.py
index d67ef8f798..2c4d8160a6 100644
--- a/openpype/hosts/tvpaint/api/communication_server.py
+++ b/openpype/hosts/tvpaint/api/communication_server.py
@@ -21,6 +21,7 @@ from aiohttp_json_rpc.protocol import (
 )
 from aiohttp_json_rpc.exceptions import RpcError
 
+from openpype import AYON_SERVER_ENABLED
 from openpype.lib import emit_event
 from openpype.hosts.tvpaint.tvpaint_plugin import get_plugin_files_path
 
@@ -834,8 +835,12 @@ class BaseCommunicator:
 
 
 class QtCommunicator(BaseCommunicator):
+    label = os.getenv("AVALON_LABEL")
+    if not label:
+        label = "AYON" if AYON_SERVER_ENABLED else "OpenPype"
+    title = "{} Tools".format(label)
     menu_definitions = {
-        "title": "OpenPype Tools",
+        "title": title,
         "menu_items": [
             {
                 "callback": "workfiles_tool",
diff --git a/openpype/hosts/tvpaint/api/pipeline.py b/openpype/hosts/tvpaint/api/pipeline.py
index 58fbd09545..a84f196f09 100644
--- a/openpype/hosts/tvpaint/api/pipeline.py
+++ b/openpype/hosts/tvpaint/api/pipeline.py
@@ -7,7 +7,7 @@ import requests
 
 import pyblish.api
 
-from openpype.client import get_project, get_asset_by_name
+from openpype.client import get_asset_by_name
 from openpype.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost
 from openpype.hosts.tvpaint import TVPAINT_ROOT_DIR
 from openpype.settings import get_current_project_settings
diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py b/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py
index 95a5cd77bd..56b51c812a 100644
--- a/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py
+++ b/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py
@@ -69,7 +69,6 @@ class CollectWorkfileData(pyblish.api.ContextPlugin):
             "asset_name": context.data["asset"],
             "task_name": context.data["task"]
         }
-        context.data["previous_context"] = current_context
         self.log.debug("Current context is: {}".format(current_context))
 
         # Collect context from workfile metadata