diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 3e39ea6c..f13a7dec 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -581,7 +581,6 @@ Ext.define('PVE.Utils', {
 	//th: 'Thai',
 	tr: 'Turkish',
     },
-    kvm_keymap_array: () => Object.entries(PVE.Utils.kvm_keymaps),
 
     kvm_vga_drivers: {
 	'__default__': Proxmox.Utils.defaultText,
@@ -598,7 +597,6 @@ Ext.define('PVE.Utils', {
 	virtio: 'VirtIO-GPU',
 	none: Proxmox.Utils.noneText,
     },
-    kvm_vga_driver_array: () => Object.entries(PVE.Utils.kvm_vga_drivers),
 
     render_kvm_language: function(value) {
 	if (!value) {
@@ -614,7 +612,6 @@ Ext.define('PVE.Utils', {
 	'html5': 'HTML5 (noVNC)',
 	'xtermjs': 'xterm.js',
     },
-    console_viewer_array: () => Object.entries(PVE.Utils.console_map),
 
     render_console_viewer: function(value) {
 	value = value || '__default__';
diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js
index 6b30ede9..bd9f8f06 100644
--- a/www/manager6/dc/OptionView.js
+++ b/www/manager6/dc/OptionView.js
@@ -70,7 +70,7 @@ Ext.define('PVE.dc.OptionView', {
 
 	me.add_combobox_row('keyboard', gettext('Keyboard Layout'), {
 	    renderer: PVE.Utils.render_kvm_language,
-	    comboItems: PVE.Utils.kvm_keymap_array(),
+	    comboItems: Object.entries(PVE.Utils.kvm_keymaps),
 	    defaultValue: '__default__',
 	    deleteEmpty: true,
 	});
@@ -81,7 +81,7 @@ Ext.define('PVE.dc.OptionView', {
 	});
 	me.add_combobox_row('console', gettext('Console Viewer'), {
 	    renderer: PVE.Utils.render_console_viewer,
-	    comboItems: PVE.Utils.console_viewer_array(),
+	    comboItems: Object.entries(PVE.Utils.console_map),
 	    defaultValue: '__default__',
 	    deleteEmpty: true,
 	});
diff --git a/www/manager6/form/VNCKeyboardSelector.js b/www/manager6/form/VNCKeyboardSelector.js
index 6d6e4783..94eb3ab2 100644
--- a/www/manager6/form/VNCKeyboardSelector.js
+++ b/www/manager6/form/VNCKeyboardSelector.js
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.VNCKeyboardSelector', {
     extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.VNCKeyboardSelector'],
-    comboItems: PVE.Utils.kvm_keymap_array(),
+    comboItems: Object.entries(PVE.Utils.kvm_keymaps),
 });
diff --git a/www/manager6/qemu/DisplayEdit.js b/www/manager6/qemu/DisplayEdit.js
index 04cfadd6..9bb1763e 100644
--- a/www/manager6/qemu/DisplayEdit.js
+++ b/www/manager6/qemu/DisplayEdit.js
@@ -17,7 +17,7 @@ Ext.define('PVE.qemu.DisplayInputPanel', {
 	value: '__default__',
 	deleteEmpty: false,
 	fieldLabel: gettext('Graphic card'),
-	comboItems: PVE.Utils.kvm_vga_driver_array(),
+	comboItems: Object.entries(PVE.Utils.kvm_vga_drivers),
 	validator: function(v) {
 	    let cfg = this.up('proxmoxWindowEdit').vmconfig || {};
 
diff --git a/www/manager6/qemu/SystemEdit.js b/www/manager6/qemu/SystemEdit.js
index 11fee24b..592c88ee 100644
--- a/www/manager6/qemu/SystemEdit.js
+++ b/www/manager6/qemu/SystemEdit.js
@@ -80,7 +80,7 @@ Ext.define('PVE.qemu.SystemInputPanel', {
 	    deleteEmpty: false,
 	    fieldLabel: gettext('Graphic card'),
 	    name: 'vga',
-	    comboItems: PVE.Utils.kvm_vga_driver_array(),
+	    comboItems: Object.entries(PVE.Utils.kvm_vga_drivers),
 	},
 	{
 	    xtype: 'proxmoxKVComboBox',