diff --git a/UPGRADE.md b/UPGRADE.md
index 1c417392..020dd9f7 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -3,6 +3,8 @@
 ## Version 4.1.0
 - [FEATURE] PIMCORE 10.5 support only
 - [IMPROVEMENT] Compatibility with Members 4.1 added
+- [IMPROVEMENT] Remove unused js classes
+- [BUGFIX] [VHS Element] Use right element context in video type selector
 
 ## Version 4.0.10
 - [BUGFIX] fix case sensitivity for accordion in bootstrap3 theme `Resources/views/toolbox/bootstrap3/accordion/partial/Accordion => Resources/views/toolbox/bootstrap3/accordion/partial/accordion`
diff --git a/src/ToolboxBundle/Resources/public/js/backend/toolbox.js b/src/ToolboxBundle/Resources/public/js/backend/toolbox.js
deleted file mode 100644
index e04d0383..00000000
--- a/src/ToolboxBundle/Resources/public/js/backend/toolbox.js
+++ /dev/null
@@ -1,6 +0,0 @@
-pimcore.registerNS('pimcore.plugin.toolbox.main');
-pimcore.plugin.toolbox.main = Class.create({});
-
-Ext.onReady(function () {
-    new pimcore.plugin.toolbox.main();
-});
\ No newline at end of file
diff --git a/src/ToolboxBundle/Resources/public/js/document/editables/vhs/editor.js b/src/ToolboxBundle/Resources/public/js/document/editables/vhs/editor.js
index 03f04cd1..dc6fa92a 100644
--- a/src/ToolboxBundle/Resources/public/js/document/editables/vhs/editor.js
+++ b/src/ToolboxBundle/Resources/public/js/document/editables/vhs/editor.js
@@ -93,11 +93,11 @@ pimcore.plugin.toolbox.vhs.editor = Class.create({
                                     }.bind(this),
                                     keyup: function (el) {
                                         if ((el.getValue().indexOf('youtu.be') >= 0 || el.getValue().indexOf('youtube.com') >= 0) && el.getValue().indexOf('http') >= 0) {
-                                            this.up('form').getComponent('type').setValue('youtube');
+                                            el.up('form').getComponent('type').setValue('youtube');
                                         } else if (el.getValue().indexOf('vimeo') >= 0 && el.getValue().indexOf('http') >= 0) {
-                                            this.up('form').getComponent('type').setValue('vimeo');
+                                            el.up('form').getComponent('type').setValue('vimeo');
                                         } else if ((el.getValue().indexOf('dai.ly') >= 0 || el.getValue().indexOf('dailymotion') >= 0) && el.getValue().indexOf('http') >= 0) {
-                                            this.up('form').getComponent('type').setValue('dailymotion');
+                                            el.up('form').getComponent('type').setValue('dailymotion');
                                         }
                                     }.bind(this)
                                 }
@@ -334,7 +334,6 @@ pimcore.plugin.toolbox.vhs.editor = Class.create({
         values['videoParameter'] = videoParameter;
 
         return values;
-
     },
 
     hideWindow: function () {
@@ -344,7 +343,6 @@ pimcore.plugin.toolbox.vhs.editor = Class.create({
         this.form = {};
 
         document.body.classList.remove('toolbox-modal-open');
-
     },
 
     onNodeOver: function (target, dd, e, data) {
diff --git a/src/ToolboxBundle/Resources/public/js/startup.js b/src/ToolboxBundle/Resources/public/js/startup.js
deleted file mode 100755
index b62b17ef..00000000
--- a/src/ToolboxBundle/Resources/public/js/startup.js
+++ /dev/null
@@ -1,13 +0,0 @@
-pimcore.registerNS('pimcore.plugin.toolbox');
-
-pimcore.plugin.toolbox = Class.create(pimcore.plugin.admin, {
-    getClassName: function() {
-        return 'pimcore.plugin.toolbox';
-    },
-    initialize: function() {
-        pimcore.plugin.broker.registerPlugin(this);
-    }
-
-});
-
-var toolboxPlugin = new pimcore.plugin.toolbox();
\ No newline at end of file
diff --git a/src/ToolboxBundle/ToolboxBundle.php b/src/ToolboxBundle/ToolboxBundle.php
index 5da36459..991b540f 100644
--- a/src/ToolboxBundle/ToolboxBundle.php
+++ b/src/ToolboxBundle/ToolboxBundle.php
@@ -41,15 +41,13 @@ public function getJsPaths(): array
         return [
             '/admin/toolbox-ckeditor-object-style.js',
             '/bundles/toolbox/js/toolbox-ckeditor-plugins.js',
-            '/bundles/toolbox/js/document/edit.js',
-            '/bundles/toolbox/js/startup.js',
+            '/bundles/toolbox/js/document/edit.js'
         ];
     }
 
     public function getEditmodeJsPaths(): array
     {
         return [
-            '/bundles/toolbox/js/backend/toolbox.js',
             '/bundles/toolbox/js/toolbox-ckeditor-plugins.js',
             '/bundles/toolbox/js/document/editables/areablock.js',
             '/bundles/toolbox/js/document/editables/googlemap.js',