diff --git a/www/manager/Workspace.js b/www/manager/Workspace.js
index 75426430..10db212f 100644
--- a/www/manager/Workspace.js
+++ b/www/manager/Workspace.js
@@ -8,11 +8,6 @@
 
 Ext.define('PVE.Workspace', {
     extend: 'Ext.container.Viewport',
-    requires: [	     
-	'Ext.tip.*',   
-	'PVE.Utils', 
-	'PVE.window.LoginWindow'
-    ],
 
     title: 'Proxmox Virtual Environment',
 
@@ -103,9 +98,6 @@ Ext.define('PVE.Workspace', {
 
 Ext.define('PVE.ConsoleWorkspace', {
     extend: 'PVE.Workspace',
-    requires: [	  
-	'PVE.KVMConsole'
-    ],
 
     alias: ['widget.pveConsoleWorkspace'],
 
diff --git a/www/manager/data/ResourceStore.js b/www/manager/data/ResourceStore.js
index e5ddcf07..c67385b6 100644
--- a/www/manager/data/ResourceStore.js
+++ b/www/manager/data/ResourceStore.js
@@ -1,6 +1,5 @@
 Ext.define('PVE.data.ResourceStore', {
     extend: 'PVE.data.UpdateStore',
-    requires: ['PVE.Utils'],
     singleton: true,
 
     findNextVMID: function() {
diff --git a/www/manager/data/UpdateStore.js b/www/manager/data/UpdateStore.js
index 0079e434..ee02cd25 100644
--- a/www/manager/data/UpdateStore.js
+++ b/www/manager/data/UpdateStore.js
@@ -1,10 +1,5 @@
 Ext.define('PVE.data.UpdateStore', {
     extend: 'Ext.data.Store',
-    requires: [
-	'PVE.Utils', 
-	'Ext.util.*', 
-	'PVE.data.UpdateQueue'
-    ],
 
     constructor: function(config) {
 	var me = this;
diff --git a/www/manager/dc/ACLView.js b/www/manager/dc/ACLView.js
index 442cfb55..7ea314c5 100644
--- a/www/manager/dc/ACLView.js
+++ b/www/manager/dc/ACLView.js
@@ -3,6 +3,7 @@ Ext.define('PVE.dc.ACLAdd', {
     alias: ['widget.pveACLAdd'],
 
     initComponent : function() {
+	/*jslint confusion: true */
         var me = this;
 
 	me.create = true;
diff --git a/www/manager/dc/AuthView.js b/www/manager/dc/AuthView.js
index 02ec8265..fe566775 100644
--- a/www/manager/dc/AuthView.js
+++ b/www/manager/dc/AuthView.js
@@ -49,7 +49,7 @@ Ext.define('PVE.dc.AuthView', {
 	});
 
 	var remove_btn = new PVE.button.Button({
- 	    text: gettext('Remove'),
+	    text: gettext('Remove'),
 	    disabled: true,
 	    selModel: sm,
 	    confirmMsg: function (rec) {
diff --git a/www/manager/dc/UserEdit.js b/www/manager/dc/UserEdit.js
index eb7ce65e..1a4d0b58 100644
--- a/www/manager/dc/UserEdit.js
+++ b/www/manager/dc/UserEdit.js
@@ -19,6 +19,9 @@ Ext.define('PVE.dc.UserEdit', {
             method = 'PUT';
 	}
 
+	var verifypw;
+	var pwfield;
+
 	var validate_pw = function() {
 	    if (verifypw.getValue() !== pwfield.getValue()) {
 		return gettext("Passwords does not match");
@@ -26,7 +29,7 @@ Ext.define('PVE.dc.UserEdit', {
 	    return true;
 	};
 
-	var verifypw = Ext.createWidget('textfield', { 
+	verifypw = Ext.createWidget('textfield', { 
 	    inputType: 'password',
 	    fieldLabel: gettext('Verify Password'), 
 	    name: 'verifypassword',
@@ -36,7 +39,7 @@ Ext.define('PVE.dc.UserEdit', {
 	    validator: validate_pw
 	});
 
-	var pwfield = Ext.createWidget('textfield', { 
+	pwfield = Ext.createWidget('textfield', { 
 	    inputType: 'password',
 	    fieldLabel: gettext('Password'), 
 	    minLength: 5,
diff --git a/www/manager/dc/UserView.js b/www/manager/dc/UserView.js
index 9b242ee7..0fa32e94 100644
--- a/www/manager/dc/UserView.js
+++ b/www/manager/dc/UserView.js
@@ -8,6 +8,9 @@ Ext.define('PVE.window.PasswordEdit', {
 	    throw "no userid specified";
 	}
 
+	var verifypw;
+	var pwfield;
+
 	var validate_pw = function() {
 	    if (verifypw.getValue() !== pwfield.getValue()) {
 		return gettext("Passwords does not match");
@@ -15,7 +18,7 @@ Ext.define('PVE.window.PasswordEdit', {
 	    return true;
 	};
 
-	var verifypw = Ext.createWidget('textfield', { 
+	verifypw = Ext.createWidget('textfield', { 
 	    inputType: 'password',
 	    fieldLabel: gettext('Verify Password'), 
 	    name: 'verifypassword',
@@ -23,7 +26,7 @@ Ext.define('PVE.window.PasswordEdit', {
 	    validator: validate_pw
 	});
 
-	var pwfield = Ext.createWidget('textfield', { 
+	pwfield = Ext.createWidget('textfield', { 
 	    inputType: 'password',
 	    fieldLabel: gettext('Password'), 
 	    minLength: 5,
@@ -39,7 +42,7 @@ Ext.define('PVE.window.PasswordEdit', {
 		{
 		    xtype: 'hiddenfield',
 		    name: 'userid',
-		    value: me.userid,
+		    value: me.userid
 		}
 	    ]
 	});
diff --git a/www/manager/form/BridgeSelector.js b/www/manager/form/BridgeSelector.js
index 086ba2e5..1cd818f4 100644
--- a/www/manager/form/BridgeSelector.js
+++ b/www/manager/form/BridgeSelector.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.form.BridgeSelector', {
     extend: 'PVE.form.ComboGrid',
-    requires: [
-	'Ext.data.Store', 
-	'PVE.RestProxy'
-    ],
     alias: ['widget.PVE.form.BridgeSelector'],
 
     setNodename: function(nodename) {
diff --git a/www/manager/form/ComboGrid.js b/www/manager/form/ComboGrid.js
index 4ec48b16..e326aaf6 100644
--- a/www/manager/form/ComboGrid.js
+++ b/www/manager/form/ComboGrid.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.form.ComboGrid', {
     extend: 'Ext.form.field.ComboBox',
-    requires: [
-	'Ext.grid.Panel',
-	'PVE.Utils'
-    ],
     alias: ['widget.PVE.form.ComboGrid'],
 
     computeHeight: function() {
diff --git a/www/manager/form/FileSelector.js b/www/manager/form/FileSelector.js
index 1044db2d..d0d7deba 100644
--- a/www/manager/form/FileSelector.js
+++ b/www/manager/form/FileSelector.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.form.FileSelector', {
     extend: 'PVE.form.ComboGrid',
-    requires: [
-	'Ext.data.Store', 
-	'PVE.RestProxy'
-    ],
     alias: ['widget.pveFileSelector'],
 
     setStorage: function(storage, nodename) {
diff --git a/www/manager/form/GroupSelector.js b/www/manager/form/GroupSelector.js
index b3d94b6c..89830deb 100644
--- a/www/manager/form/GroupSelector.js
+++ b/www/manager/form/GroupSelector.js
@@ -47,7 +47,7 @@ Ext.define('PVE.form.GroupSelector', {
 	fields: [ 'groupid', 'comment' ],
 	proxy: {
             type: 'pve',
-	    url: "/api2/json/access/groups",
+	    url: "/api2/json/access/groups"
 	},
 	idProperty: 'groupid'
     });
diff --git a/www/manager/form/NodeSelector.js b/www/manager/form/NodeSelector.js
index 9e446f54..e992515b 100644
--- a/www/manager/form/NodeSelector.js
+++ b/www/manager/form/NodeSelector.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.form.NodeSelector', {
     extend: 'PVE.form.ComboGrid',
-    requires: [
-	'Ext.data.Store', 
-	'PVE.RestProxy'
-    ],
     alias: ['widget.PVE.form.NodeSelector'],
 
     // invalidate nodes which are offline
diff --git a/www/manager/form/PoolSelector.js b/www/manager/form/PoolSelector.js
index ca930454..fa9a30fc 100644
--- a/www/manager/form/PoolSelector.js
+++ b/www/manager/form/PoolSelector.js
@@ -47,7 +47,7 @@ Ext.define('PVE.form.PoolSelector', {
 	fields: [ 'poolid', 'comment' ],
 	proxy: {
             type: 'pve',
-	    url: "/api2/json/access/pools",
+	    url: "/api2/json/access/pools"
 	},
 	idProperty: 'poolid'
     });
diff --git a/www/manager/form/RRDTypeSelector.js b/www/manager/form/RRDTypeSelector.js
index 061484d2..973a64a2 100644
--- a/www/manager/form/RRDTypeSelector.js
+++ b/www/manager/form/RRDTypeSelector.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.form.RRDTypeSelector', {
     extend: 'Ext.form.field.ComboBox',
-    requires: [
-	'Ext.state.Manager'
-    ],
-
     alias: ['widget.pveRRDTypeSelector'],
   
     initComponent: function() {
diff --git a/www/manager/form/RealmComboBox.js b/www/manager/form/RealmComboBox.js
index a25b503c..04289dbd 100644
--- a/www/manager/form/RealmComboBox.js
+++ b/www/manager/form/RealmComboBox.js
@@ -1,6 +1,5 @@
 Ext.define('PVE.form.RealmComboBox', {
     extend: 'Ext.form.field.ComboBox',
-    requires: ['Ext.data.Store', 'PVE.RestProxy'],
     alias: ['widget.pveRealmComboBox'],
 
     initComponent: function() {
diff --git a/www/manager/form/StorageSelector.js b/www/manager/form/StorageSelector.js
index cadbd4fa..497aae7c 100644
--- a/www/manager/form/StorageSelector.js
+++ b/www/manager/form/StorageSelector.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.form.StorageSelector', {
     extend: 'PVE.form.ComboGrid',
-    requires: [
-	'Ext.data.Store', 
-	'PVE.RestProxy'
-    ],
     alias: ['widget.PVE.form.StorageSelector'],
 
     setNodename: function(nodename) {
diff --git a/www/manager/form/ViewSelector.js b/www/manager/form/ViewSelector.js
index d971f522..c74f75cb 100644
--- a/www/manager/form/ViewSelector.js
+++ b/www/manager/form/ViewSelector.js
@@ -1,6 +1,5 @@
 Ext.define('PVE.form.ViewSelector', {
     extend: 'Ext.form.field.ComboBox',
-    requires: ['Ext.data.Store'],
     alias: ['widget.pveViewSelector'],
 
     initComponent: function() {
diff --git a/www/manager/grid/ObjectGrid.js b/www/manager/grid/ObjectGrid.js
index d9307786..96962bde 100644
--- a/www/manager/grid/ObjectGrid.js
+++ b/www/manager/grid/ObjectGrid.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.grid.ObjectGrid', {
     extend: 'Ext.grid.GridPanel',
-    requires: [
-	'Ext.grid.*',
-	'PVE.data.ObjectStore'
-    ],
     alias: ['widget.pveObjectGrid'],
 
     getObjectValue: function(key, defaultValue) {
diff --git a/www/manager/grid/PoolMembers.js b/www/manager/grid/PoolMembers.js
index e104c72d..7798d56e 100644
--- a/www/manager/grid/PoolMembers.js
+++ b/www/manager/grid/PoolMembers.js
@@ -2,6 +2,7 @@ Ext.define('PVE.pool.AddVM', {
     extend: 'PVE.window.Edit',
 
     initComponent : function() {
+	/*jslint confusion: true */
 	var me = this;
 
 	if (!me.pool) {
@@ -35,6 +36,7 @@ Ext.define('PVE.pool.AddStorage', {
     extend: 'PVE.window.Edit',
 
     initComponent : function() {
+	/*jslint confusion: true */
 	var me = this;
 
 	if (!me.pool) {
diff --git a/www/manager/grid/ResourceGrid.js b/www/manager/grid/ResourceGrid.js
index 8054b6d2..7f94bc5c 100644
--- a/www/manager/grid/ResourceGrid.js
+++ b/www/manager/grid/ResourceGrid.js
@@ -15,16 +15,6 @@ Ext.override(Ext.grid.feature.Chunking, {
 
 Ext.define('PVE.grid.ResourceGrid', {
     extend: 'Ext.grid.GridPanel',
-    requires: [
-	'Ext.grid.*',
-	'Ext.grid.feature.Chunking',
-	'Ext.state.Manager',
-	'Ext.data.*',
-	'Ext.data.Store',
-	'Ext.util.*',
-	'PVE.Utils', 
-	'PVE.data.ResourceStore'
-    ],
     alias: ['widget.pveResourceGrid'],
 
     //fixme: this makes still problems with the scrollbar
diff --git a/www/manager/index.pl b/www/manager/index.pl
index ddde3867..000edb16 100644
--- a/www/manager/index.pl
+++ b/www/manager/index.pl
@@ -71,8 +71,6 @@ if (-f $langfile) {
 
 $jssrc .= <<_EOJS;
 
-Ext.require(['*', '$workspace']);
-
 // we need this (the java applet ignores the zindex)
 Ext.useShims = true;
 
diff --git a/www/manager/node/DNSEdit.js b/www/manager/node/DNSEdit.js
index 4b3261d6..a29236ec 100644
--- a/www/manager/node/DNSEdit.js
+++ b/www/manager/node/DNSEdit.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.node.DNSEdit', {
     extend: 'PVE.window.Edit',
-    requires: [
-	'PVE.Utils'
-    ],
-
     alias: ['widget.pveNodeDNSEdit'],
 
     initComponent : function() {
diff --git a/www/manager/node/TimeEdit.js b/www/manager/node/TimeEdit.js
index f56d7450..c976eb24 100644
--- a/www/manager/node/TimeEdit.js
+++ b/www/manager/node/TimeEdit.js
@@ -1,6 +1,5 @@
 Ext.define('PVE.node.TimeEdit', {
     extend: 'PVE.window.Edit',
-    requires: ['PVE.data.TimezoneStore'],
     alias: ['widget.pveNodeTimeEdit'],
 
     initComponent : function() {
diff --git a/www/manager/openvz/CreateWizard.js b/www/manager/openvz/CreateWizard.js
index 38d7e8e4..cd60c049 100644
--- a/www/manager/openvz/CreateWizard.js
+++ b/www/manager/openvz/CreateWizard.js
@@ -1,10 +1,6 @@
 /*jslint confusion: true */
 Ext.define('PVE.openvz.CreateWizard', {
     extend: 'PVE.window.Wizard',
-    requires: [    
-	'Ext.form.*',
-	'PVE.data.ResourceStore'
-    ],
 
     initComponent: function() {
 	var me = this;
diff --git a/www/manager/openvz/Network.js b/www/manager/openvz/Network.js
index f2d91776..c904d65d 100644
--- a/www/manager/openvz/Network.js
+++ b/www/manager/openvz/Network.js
@@ -147,9 +147,6 @@ Ext.define('PVE.OpenVZ.IPAdd', {
 
 Ext.define('PVE.openvz.NetworkView', {
     extend: 'Ext.grid.GridPanel',
-    requires: [
-	'Ext.grid.*'
-    ],
     alias: ['widget.pveOpenVZNetworkView'],
 
     dataCache: {}, // used to store result of last load
diff --git a/www/manager/panel/InputPanel.js b/www/manager/panel/InputPanel.js
index 1c6c9c5f..a7da9f41 100644
--- a/www/manager/panel/InputPanel.js
+++ b/www/manager/panel/InputPanel.js
@@ -1,8 +1,5 @@
 Ext.define('PVE.panel.InputPanel', {
     extend: 'Ext.panel.Panel',
-    requires: [
-	'PVE.Utils'
-    ],
     alias: ['widget.inputpanel'],
 
     border: false,
diff --git a/www/manager/panel/StatusPanel.js b/www/manager/panel/StatusPanel.js
index ed0d4f37..0c5beb45 100644
--- a/www/manager/panel/StatusPanel.js
+++ b/www/manager/panel/StatusPanel.js
@@ -1,10 +1,5 @@
 Ext.define('PVE.panel.StatusPanel', {
     extend: 'Ext.tab.Panel',
-    requires: [
-	'Ext.state.Manager',
-	'PVE.dc.Log',
-	'PVE.dc.Tasks'
-    ],
     alias: 'widget.pveStatusPanel',
 
     
diff --git a/www/manager/qemu/CreateWizard.js b/www/manager/qemu/CreateWizard.js
index b58cd7ce..99466325 100644
--- a/www/manager/qemu/CreateWizard.js
+++ b/www/manager/qemu/CreateWizard.js
@@ -2,10 +2,6 @@
 /*jslint confusion: true */
 Ext.define('PVE.qemu.CreateWizard', {
     extend: 'PVE.window.Wizard',
-    requires: [    
-	'Ext.form.*',
-	'PVE.data.ResourceStore'
-    ],
 
     initComponent: function() {
 	var me = this;
diff --git a/www/manager/tree/ResourceTree.js b/www/manager/tree/ResourceTree.js
index da694d7e..a640124f 100644
--- a/www/manager/tree/ResourceTree.js
+++ b/www/manager/tree/ResourceTree.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.tree.ResourceTree', {
     extend: 'Ext.tree.TreePanel',
-    requires: ['Ext.tree.*', 
-	       'Ext.state.Manager',
-	       'PVE.Utils', 
-	       'PVE.data.ResourceStore'],
     alias: ['widget.pveResourceTree'],
 
     statics: {
diff --git a/www/manager/window/LoginWindow.js b/www/manager/window/LoginWindow.js
index e8f8e7f0..74fba4b7 100644
--- a/www/manager/window/LoginWindow.js
+++ b/www/manager/window/LoginWindow.js
@@ -1,6 +1,5 @@
 Ext.define('PVE.window.LoginWindow', {
     extend: 'Ext.window.Window',
-    requires: ['PVE.form.RealmComboBox'],
 
     // private
     onLogon: function() {
diff --git a/www/manager/window/TaskViewer.js b/www/manager/window/TaskViewer.js
index 75e6a5e8..75e91b5e 100644
--- a/www/manager/window/TaskViewer.js
+++ b/www/manager/window/TaskViewer.js
@@ -3,9 +3,6 @@
 
 Ext.define('PVE.window.TaskViewer', {
     extend: 'Ext.window.Window',
-    requires: [
-        'PVE.Utils'
-    ],
     alias: 'widget.pveTaskViewer',
 
     initComponent: function() {
diff --git a/www/manager/window/Wizard.js b/www/manager/window/Wizard.js
index a6e779fd..0e6b02d3 100644
--- a/www/manager/window/Wizard.js
+++ b/www/manager/window/Wizard.js
@@ -1,8 +1,5 @@
 Ext.define('PVE.window.Wizard', {
     extend: 'Ext.window.Window',
-    requires: [
-	'PVE.Utils'
-    ],
     
     getValues: function(dirtyOnly) {
 	var me = this;