diff --git a/Editor/Callbacks.meta b/Editor/Callbacks.meta
deleted file mode 100644
index f562d8b..0000000
--- a/Editor/Callbacks.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cba517ad007641546a927424e02d4ed5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Editor/Callbacks/AvatarUploadHider.cs b/Editor/Callbacks/AvatarUploadHider.cs
deleted file mode 100644
index 0af537b..0000000
--- a/Editor/Callbacks/AvatarUploadHider.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEditor;
-using UnityEngine;
-
-#if VRC_SDK_VRCSDK3 && !UDON
-using VRC.Core;
-using VRC.SDKBase.Editor.BuildPipeline;
-using VRC_AvatarDescriptor = VRC.SDK3.Avatars.Components.VRCAvatarDescriptor;
-#endif
-
-namespace Pumkin.AvatarTools.Callbacks
-{
-#if VRC_SDK_VRCSDK3 && !UDON
-    class AvatarUploadHider : IVRCSDKPreprocessAvatarCallback
-    {
-        public int callbackOrder => 0;
-
-        const string uploadTargetPrefName = "UploadTargetAvatarID";
-
-        static bool _enabled = true;
-        static GameObject _uploadTarget;
-        static IEnumerable<GameObject> _avatarCache;
-
-        static string AvatarID
-        {
-            get => PrefManager.GetString(uploadTargetPrefName);
-            set => PrefManager.SetString(uploadTargetPrefName, value);
-        }
-        public static bool Enabled
-        {
-            get => _enabled;
-            set
-            {
-                _enabled = value;
-                if(EditorApplication.isPlaying)
-                    SetOtherAvatarsActiveState(!value);
-            }
-        }
-        public static GameObject UploadTarget
-        {
-            get
-            {
-                if(!_uploadTarget)
-                {
-                    string id = AvatarID;
-                    if(!string.IsNullOrWhiteSpace(id))
-                        _uploadTarget = GameObject.FindObjectsOfType<PipelineManager>()
-                            .Where(a => a.blueprintId == id)
-                            .Select(a => a.gameObject)
-                            .FirstOrDefault();
-                    AvatarID = null;
-                }
-                return _uploadTarget;
-            }
-        }
-        static IEnumerable<GameObject> AvatarCache
-        {
-            get
-            {
-                if(_avatarCache == null)
-                {
-                    var avs = GameObject.FindObjectsOfType<VRC_AvatarDescriptor>();
-                    if(avs != null)
-                        _avatarCache = avs.Select(x => x.gameObject);
-                }
-                return _avatarCache;
-            }
-        }
-
-
-        public AvatarUploadHider()
-        {
-            EditorApplication.playModeStateChanged -= HandlePlayModeStateChange;
-            EditorApplication.playModeStateChanged += HandlePlayModeStateChange;
-        }
-
-        public bool OnPreprocessAvatar(GameObject avatarGameObject)
-        {
-            try
-            {
-                AvatarID = avatarGameObject.GetComponent<PipelineManager>().blueprintId;
-            }
-            catch(Exception e)
-            {
-                PumkinsAvatarTools.Log("Failed to hide avatars: " + e.Message, LogType.Warning);
-            }
-            return true;
-        }
-
-        void HandlePlayModeStateChange(PlayModeStateChange mode)
-        {
-            if(mode != PlayModeStateChange.EnteredPlayMode)
-                return;
-
-            if(!Enabled || UploadTarget == null)
-                return;
-
-            SetOtherAvatarsActiveState(false);
-        }
-
-        static void SetOtherAvatarsActiveState(bool isActive)
-        {
-            if(AvatarCache is null || UploadTarget is null)
-                return;
-
-            foreach(var av in AvatarCache)
-            {
-                if(av == UploadTarget)
-                    continue;
-                if(av != null)
-                    av.gameObject.SetActive(isActive);
-            }
-        }
-    }
-#endif
-}
diff --git a/Editor/Callbacks/AvatarUploadHider.cs.meta b/Editor/Callbacks/AvatarUploadHider.cs.meta
deleted file mode 100644
index 17920e3..0000000
--- a/Editor/Callbacks/AvatarUploadHider.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 737f46ad81794b24881198257630b590
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Editor/PumkinsAvatarTools.cs b/Editor/PumkinsAvatarTools.cs
index 9d47642..c366c1a 100644
--- a/Editor/PumkinsAvatarTools.cs
+++ b/Editor/PumkinsAvatarTools.cs
@@ -5,7 +5,6 @@
 using System.IO;
 using UnityEngine;
 using System.Linq;
-using Pumkin.AvatarTools.Callbacks;
 using Pumkin.AvatarTools.Copiers;
 using Pumkin.AvatarTools.Destroyers;
 using Pumkin.DependencyChecker;
@@ -827,9 +826,6 @@ public void HandleOnEnable()
 
             LoadPrefs();
 
-#if VRC_SDK_VRCSDK3 && !UDON
-            AvatarUploadHider.Enabled = Settings.shouldHideOtherAvatars;
-#endif
             RestoreTexturesFromPaths();
             RefreshBackgroundOverrideType();
 
diff --git a/Editor/PumkinsAvatarTools_UI.cs b/Editor/PumkinsAvatarTools_UI.cs
index 1c56199..cee3b55 100644
--- a/Editor/PumkinsAvatarTools_UI.cs
+++ b/Editor/PumkinsAvatarTools_UI.cs
@@ -5,7 +5,6 @@
 using System.IO;
 using UnityEngine;
 using System.Linq;
-using Pumkin.AvatarTools.Callbacks;
 using Pumkin.AvatarTools.Copiers;
 using Pumkin.PoseEditor;
 using UnityEngine.UI;
@@ -1622,19 +1621,6 @@ void DrawThumbnailsMenuGUI()
             {
                 Helpers.DrawGUILine();
 
-#if VRC_SDK_VRCSDK3 && !UDON
-                EditorGUI.BeginChangeCheck();
-                {
-                    Settings.shouldHideOtherAvatars = GUILayout.Toggle(Settings.shouldHideOtherAvatars, Strings.Thumbnails.hideOtherAvatars);
-                }
-                if(EditorGUI.EndChangeCheck())
-                {
-                    AvatarUploadHider.Enabled = Settings.shouldHideOtherAvatars;
-                }
-#endif
-
-                Helpers.DrawGUILine();
-
                 EditorGUI.BeginChangeCheck();
                 {
                     Settings._presetToolbarSelectedIndex = GUILayout.Toolbar(Settings._presetToolbarSelectedIndex, new string[] { Strings.Thumbnails.cameras, Strings.Thumbnails.poses, Strings.Thumbnails.blendshapes }, Styles.ToolbarBigButtons);
diff --git a/Editor/PumkinsAvatarTools_UtilityFunctions.cs b/Editor/PumkinsAvatarTools_UtilityFunctions.cs
index f93771e..766fd64 100644
--- a/Editor/PumkinsAvatarTools_UtilityFunctions.cs
+++ b/Editor/PumkinsAvatarTools_UtilityFunctions.cs
@@ -5,7 +5,6 @@
 using System.IO;
 using UnityEngine;
 using System.Linq;
-using Pumkin.AvatarTools.Callbacks;
 using Pumkin.AvatarTools.Copiers;
 using Pumkin.AvatarTools.Destroyers;
 using Pumkin.DependencyChecker;
diff --git a/package.json b/package.json
index f601118..3cf38db 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "io.github.rurre.pumkinsavatartools",
   "displayName": "Pumkins Avatar Tools",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "An editor script that adds tools to help you setup avatars faster and easier. It includes a component copier that makes it a lot easier to reimport your avatars, and tools to make your thumbnails nicer.",
   "url": "https://github.com/rurre/PumkinsAvatarTools",
   "author": {