diff --git a/build/amd/vite.config.js b/build/amd/vite.config.js
index 02968a54..337242cc 100644
--- a/build/amd/vite.config.js
+++ b/build/amd/vite.config.js
@@ -21,9 +21,6 @@ export default defineConfig(async (args) => {
 	/** @type {import('vite').UserConfig} */
 	return {
 		base: './',
-		define: {
-			AMD: false
-		},
 		build: {
 			lib: {
 				cssFileName: 'editor/editor.main',
diff --git a/build/build-monaco-editor.ts b/build/build-monaco-editor.ts
index cda5105a..deb99cf7 100644
--- a/build/build-monaco-editor.ts
+++ b/build/build-monaco-editor.ts
@@ -80,9 +80,6 @@ function ESM_release() {
 		target: 'esnext',
 		format: 'esm',
 		drop: ['debugger'],
-		define: {
-			AMD: 'false'
-		},
 		banner: {
 			js: bundledFileHeader
 		},
diff --git a/build/utils.ts b/build/utils.ts
index 841b4536..69c9d824 100644
--- a/build/utils.ts
+++ b/build/utils.ts
@@ -105,9 +105,6 @@ export function buildESM(options: { base: string; entryPoints: string[]; externa
 		target: 'esnext',
 		format: 'esm',
 		drop: ['debugger'],
-		define: {
-			AMD: 'false'
-		},
 		banner: {
 			js: bundledFileHeader
 		},
diff --git a/src/basic-languages/abap/abap.contribution.ts b/src/basic-languages/abap/abap.contribution.ts
index 549e1980..c515f9d2 100644
--- a/src/basic-languages/abap/abap.contribution.ts
+++ b/src/basic-languages/abap/abap.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'abap',
 	extensions: ['.abap'],
 	aliases: ['abap', 'ABAP'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/abap/abap'], resolve, reject);
-			});
-		} else {
-			return import('./abap');
-		}
-	}
+	loader: () => import('./abap')
 });
diff --git a/src/basic-languages/apex/apex.contribution.ts b/src/basic-languages/apex/apex.contribution.ts
index 89d0dfbf..58e86d59 100644
--- a/src/basic-languages/apex/apex.contribution.ts
+++ b/src/basic-languages/apex/apex.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'apex',
 	extensions: ['.cls'],
 	aliases: ['Apex', 'apex'],
 	mimetypes: ['text/x-apex-source', 'text/x-apex'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/apex/apex'], resolve, reject);
-			});
-		} else {
-			return import('./apex');
-		}
-	}
+	loader: () => import('./apex')
 });
diff --git a/src/basic-languages/azcli/azcli.contribution.ts b/src/basic-languages/azcli/azcli.contribution.ts
index 2eb7b19c..b0f5bcc1 100644
--- a/src/basic-languages/azcli/azcli.contribution.ts
+++ b/src/basic-languages/azcli/azcli.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'azcli',
 	extensions: ['.azcli'],
 	aliases: ['Azure CLI', 'azcli'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/azcli/azcli'], resolve, reject);
-			});
-		} else {
-			return import('./azcli');
-		}
-	}
+	loader: () => import('./azcli')
 });
diff --git a/src/basic-languages/bat/bat.contribution.ts b/src/basic-languages/bat/bat.contribution.ts
index 7e4f7758..bc9cdd1f 100644
--- a/src/basic-languages/bat/bat.contribution.ts
+++ b/src/basic-languages/bat/bat.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'bat',
 	extensions: ['.bat', '.cmd'],
 	aliases: ['Batch', 'bat'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/bat/bat'], resolve, reject);
-			});
-		} else {
-			return import('./bat');
-		}
-	}
+	loader: () => import('./bat')
 });
diff --git a/src/basic-languages/bicep/bicep.contribution.ts b/src/basic-languages/bicep/bicep.contribution.ts
index 7c5fd6b8..ae9837ec 100644
--- a/src/basic-languages/bicep/bicep.contribution.ts
+++ b/src/basic-languages/bicep/bicep.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'bicep',
 	extensions: ['.bicep'],
 	aliases: ['Bicep'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/bicep/bicep'], resolve, reject);
-			});
-		} else {
-			return import('./bicep');
-		}
-	}
+	loader: () => import('./bicep')
 });
diff --git a/src/basic-languages/cameligo/cameligo.contribution.ts b/src/basic-languages/cameligo/cameligo.contribution.ts
index 8bfa0009..07c7ec2e 100644
--- a/src/basic-languages/cameligo/cameligo.contribution.ts
+++ b/src/basic-languages/cameligo/cameligo.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'cameligo',
 	extensions: ['.mligo'],
 	aliases: ['Cameligo'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/cameligo/cameligo'], resolve, reject);
-			});
-		} else {
-			return import('./cameligo');
-		}
-	}
+	loader: () => import('./cameligo')
 });
diff --git a/src/basic-languages/clojure/clojure.contribution.ts b/src/basic-languages/clojure/clojure.contribution.ts
index e6d8a1f3..139424ba 100644
--- a/src/basic-languages/clojure/clojure.contribution.ts
+++ b/src/basic-languages/clojure/clojure.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'clojure',
 	extensions: ['.clj', '.cljs', '.cljc', '.edn'],
 	aliases: ['clojure', 'Clojure'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/clojure/clojure'], resolve, reject);
-			});
-		} else {
-			return import('./clojure');
-		}
-	}
+	loader: () => import('./clojure')
 });
diff --git a/src/basic-languages/coffee/coffee.contribution.ts b/src/basic-languages/coffee/coffee.contribution.ts
index e36711d1..6af9a015 100644
--- a/src/basic-languages/coffee/coffee.contribution.ts
+++ b/src/basic-languages/coffee/coffee.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'coffeescript',
 	extensions: ['.coffee'],
 	aliases: ['CoffeeScript', 'coffeescript', 'coffee'],
 	mimetypes: ['text/x-coffeescript', 'text/coffeescript'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/coffee/coffee'], resolve, reject);
-			});
-		} else {
-			return import('./coffee');
-		}
-	}
+	loader: () => import('./coffee')
 });
diff --git a/src/basic-languages/cpp/cpp.contribution.ts b/src/basic-languages/cpp/cpp.contribution.ts
index 51a874d1..523f4207 100644
--- a/src/basic-languages/cpp/cpp.contribution.ts
+++ b/src/basic-languages/cpp/cpp.contribution.ts
@@ -5,34 +5,15 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'c',
 	extensions: ['.c', '.h'],
 	aliases: ['C', 'c'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/cpp/cpp'], resolve, reject);
-			});
-		} else {
-			return import('./cpp');
-		}
-	}
+	loader: () => import('./cpp')
 });
 registerLanguage({
 	id: 'cpp',
 	extensions: ['.cpp', '.cc', '.cxx', '.hpp', '.hh', '.hxx'],
 	aliases: ['C++', 'Cpp', 'cpp'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/cpp/cpp'], resolve, reject);
-			});
-		} else {
-			return import('./cpp');
-		}
-	}
+	loader: () => import('./cpp')
 });
diff --git a/src/basic-languages/csharp/csharp.contribution.ts b/src/basic-languages/csharp/csharp.contribution.ts
index 08498216..06e44f0d 100644
--- a/src/basic-languages/csharp/csharp.contribution.ts
+++ b/src/basic-languages/csharp/csharp.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'csharp',
 	extensions: ['.cs', '.csx', '.cake'],
 	aliases: ['C#', 'csharp'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/csharp/csharp'], resolve, reject);
-			});
-		} else {
-			return import('./csharp');
-		}
-	}
+	loader: () => import('./csharp')
 });
diff --git a/src/basic-languages/csp/csp.contribution.ts b/src/basic-languages/csp/csp.contribution.ts
index c5d1379f..80c41f9a 100644
--- a/src/basic-languages/csp/csp.contribution.ts
+++ b/src/basic-languages/csp/csp.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'csp',
 	extensions: ['.csp'],
 	aliases: ['CSP', 'csp'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/csp/csp'], resolve, reject);
-			});
-		} else {
-			return import('./csp');
-		}
-	}
+	loader: () => import('./csp')
 });
diff --git a/src/basic-languages/css/css.contribution.ts b/src/basic-languages/css/css.contribution.ts
index 6352c221..88d089fa 100644
--- a/src/basic-languages/css/css.contribution.ts
+++ b/src/basic-languages/css/css.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'css',
 	extensions: ['.css'],
 	aliases: ['CSS', 'css'],
 	mimetypes: ['text/css'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/css/css'], resolve, reject);
-			});
-		} else {
-			return import('./css');
-		}
-	}
+	loader: () => import('./css')
 });
diff --git a/src/basic-languages/cypher/cypher.contribution.ts b/src/basic-languages/cypher/cypher.contribution.ts
index e9d06430..c4198521 100644
--- a/src/basic-languages/cypher/cypher.contribution.ts
+++ b/src/basic-languages/cypher/cypher.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'cypher',
 	extensions: ['.cypher', '.cyp'],
 	aliases: ['Cypher', 'OpenCypher'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/cypher/cypher'], resolve, reject);
-			});
-		} else {
-			return import('./cypher');
-		}
-	}
+	loader: () => import('./cypher')
 });
diff --git a/src/basic-languages/dart/dart.contribution.ts b/src/basic-languages/dart/dart.contribution.ts
index e2daa614..7b3cff5e 100644
--- a/src/basic-languages/dart/dart.contribution.ts
+++ b/src/basic-languages/dart/dart.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'dart',
 	extensions: ['.dart'],
 	aliases: ['Dart', 'dart'],
 	mimetypes: ['text/x-dart-source', 'text/x-dart'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/dart/dart'], resolve, reject);
-			});
-		} else {
-			return import('./dart');
-		}
-	}
+	loader: () => import('./dart')
 });
diff --git a/src/basic-languages/dockerfile/dockerfile.contribution.ts b/src/basic-languages/dockerfile/dockerfile.contribution.ts
index 9869a595..51c73e3d 100644
--- a/src/basic-languages/dockerfile/dockerfile.contribution.ts
+++ b/src/basic-languages/dockerfile/dockerfile.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'dockerfile',
 	extensions: ['.dockerfile'],
 	filenames: ['Dockerfile'],
 	aliases: ['Dockerfile'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/dockerfile/dockerfile'], resolve, reject);
-			});
-		} else {
-			return import('./dockerfile');
-		}
-	}
+	loader: () => import('./dockerfile')
 });
diff --git a/src/basic-languages/ecl/ecl.contribution.ts b/src/basic-languages/ecl/ecl.contribution.ts
index 638227ee..dfa4ed90 100644
--- a/src/basic-languages/ecl/ecl.contribution.ts
+++ b/src/basic-languages/ecl/ecl.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'ecl',
 	extensions: ['.ecl'],
 	aliases: ['ECL', 'Ecl', 'ecl'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/ecl/ecl'], resolve, reject);
-			});
-		} else {
-			return import('./ecl');
-		}
-	}
+	loader: () => import('./ecl')
 });
diff --git a/src/basic-languages/elixir/elixir.contribution.ts b/src/basic-languages/elixir/elixir.contribution.ts
index 38927938..aaeafa94 100644
--- a/src/basic-languages/elixir/elixir.contribution.ts
+++ b/src/basic-languages/elixir/elixir.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'elixir',
 	extensions: ['.ex', '.exs'],
 	aliases: ['Elixir', 'elixir', 'ex'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/elixir/elixir'], resolve, reject);
-			});
-		} else {
-			return import('./elixir');
-		}
-	}
+	loader: () => import('./elixir')
 });
diff --git a/src/basic-languages/flow9/flow9.contribution.ts b/src/basic-languages/flow9/flow9.contribution.ts
index 0c2fc8ca..649114b4 100644
--- a/src/basic-languages/flow9/flow9.contribution.ts
+++ b/src/basic-languages/flow9/flow9.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'flow9',
 	extensions: ['.flow'],
 	aliases: ['Flow9', 'Flow', 'flow9', 'flow'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/flow9/flow9'], resolve, reject);
-			});
-		} else {
-			return import('./flow9');
-		}
-	}
+	loader: () => import('./flow9')
 });
diff --git a/src/basic-languages/freemarker2/freemarker2.contribution.ts b/src/basic-languages/freemarker2/freemarker2.contribution.ts
index ce4e157f..30491337 100644
--- a/src/basic-languages/freemarker2/freemarker2.contribution.ts
+++ b/src/basic-languages/freemarker2/freemarker2.contribution.ts
@@ -5,9 +5,6 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 // freemarker.tag-square.interpolation-dollar is the default
 // According the docs tag-auto will be the default for version 2.4+, but that
 // hasn't event been released yet.
@@ -16,13 +13,7 @@ registerLanguage({
 	extensions: ['.ftl', '.ftlh', '.ftlx'],
 	aliases: ['FreeMarker2', 'Apache FreeMarker2'],
 	loader: () => {
-		if (AMD) {
-			return new Promise<typeof import('./freemarker2')>((resolve, reject) => {
-				require(['vs/basic-languages/freemarker2/freemarker2'], resolve, reject);
-			}).then((m) => m.TagAngleInterpolationDollar);
-		} else {
-			return import('./freemarker2').then((m) => m.TagAutoInterpolationDollar);
-		}
+		return import('./freemarker2').then((m) => m.TagAutoInterpolationDollar);
 	}
 });
 
@@ -30,13 +21,7 @@ registerLanguage({
 	id: 'freemarker2.tag-angle.interpolation-dollar',
 	aliases: ['FreeMarker2 (Angle/Dollar)', 'Apache FreeMarker2 (Angle/Dollar)'],
 	loader: () => {
-		if (AMD) {
-			return new Promise<typeof import('./freemarker2')>((resolve, reject) => {
-				require(['vs/basic-languages/freemarker2/freemarker2'], resolve, reject);
-			}).then((m) => m.TagAngleInterpolationDollar);
-		} else {
-			return import('./freemarker2').then((m) => m.TagAngleInterpolationDollar);
-		}
+		return import('./freemarker2').then((m) => m.TagAngleInterpolationDollar);
 	}
 });
 
@@ -44,13 +29,7 @@ registerLanguage({
 	id: 'freemarker2.tag-bracket.interpolation-dollar',
 	aliases: ['FreeMarker2 (Bracket/Dollar)', 'Apache FreeMarker2 (Bracket/Dollar)'],
 	loader: () => {
-		if (AMD) {
-			return new Promise<typeof import('./freemarker2')>((resolve, reject) => {
-				require(['vs/basic-languages/freemarker2/freemarker2'], resolve, reject);
-			}).then((m) => m.TagBracketInterpolationDollar);
-		} else {
-			return import('./freemarker2').then((m) => m.TagBracketInterpolationDollar);
-		}
+		return import('./freemarker2').then((m) => m.TagBracketInterpolationDollar);
 	}
 });
 
@@ -58,13 +37,7 @@ registerLanguage({
 	id: 'freemarker2.tag-angle.interpolation-bracket',
 	aliases: ['FreeMarker2 (Angle/Bracket)', 'Apache FreeMarker2 (Angle/Bracket)'],
 	loader: () => {
-		if (AMD) {
-			return new Promise<typeof import('./freemarker2')>((resolve, reject) => {
-				require(['vs/basic-languages/freemarker2/freemarker2'], resolve, reject);
-			}).then((m) => m.TagAngleInterpolationBracket);
-		} else {
-			return import('./freemarker2').then((m) => m.TagAngleInterpolationBracket);
-		}
+		return import('./freemarker2').then((m) => m.TagAngleInterpolationBracket);
 	}
 });
 
@@ -72,13 +45,7 @@ registerLanguage({
 	id: 'freemarker2.tag-bracket.interpolation-bracket',
 	aliases: ['FreeMarker2 (Bracket/Bracket)', 'Apache FreeMarker2 (Bracket/Bracket)'],
 	loader: () => {
-		if (AMD) {
-			return new Promise<typeof import('./freemarker2')>((resolve, reject) => {
-				require(['vs/basic-languages/freemarker2/freemarker2'], resolve, reject);
-			}).then((m) => m.TagBracketInterpolationBracket);
-		} else {
-			return import('./freemarker2').then((m) => m.TagBracketInterpolationBracket);
-		}
+		return import('./freemarker2').then((m) => m.TagBracketInterpolationBracket);
 	}
 });
 
@@ -86,13 +53,7 @@ registerLanguage({
 	id: 'freemarker2.tag-auto.interpolation-dollar',
 	aliases: ['FreeMarker2 (Auto/Dollar)', 'Apache FreeMarker2 (Auto/Dollar)'],
 	loader: () => {
-		if (AMD) {
-			return new Promise<typeof import('./freemarker2')>((resolve, reject) => {
-				require(['vs/basic-languages/freemarker2/freemarker2'], resolve, reject);
-			}).then((m) => m.TagAutoInterpolationDollar);
-		} else {
-			return import('./freemarker2').then((m) => m.TagAutoInterpolationDollar);
-		}
+		return import('./freemarker2').then((m) => m.TagAutoInterpolationDollar);
 	}
 });
 
@@ -100,12 +61,6 @@ registerLanguage({
 	id: 'freemarker2.tag-auto.interpolation-bracket',
 	aliases: ['FreeMarker2 (Auto/Bracket)', 'Apache FreeMarker2 (Auto/Bracket)'],
 	loader: () => {
-		if (AMD) {
-			return new Promise<typeof import('./freemarker2')>((resolve, reject) => {
-				require(['vs/basic-languages/freemarker2/freemarker2'], resolve, reject);
-			}).then((m) => m.TagAutoInterpolationBracket);
-		} else {
-			return import('./freemarker2').then((m) => m.TagAutoInterpolationBracket);
-		}
+		return import('./freemarker2').then((m) => m.TagAutoInterpolationBracket);
 	}
 });
diff --git a/src/basic-languages/fsharp/fsharp.contribution.ts b/src/basic-languages/fsharp/fsharp.contribution.ts
index cad832f1..d754dde5 100644
--- a/src/basic-languages/fsharp/fsharp.contribution.ts
+++ b/src/basic-languages/fsharp/fsharp.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'fsharp',
 	extensions: ['.fs', '.fsi', '.ml', '.mli', '.fsx', '.fsscript'],
 	aliases: ['F#', 'FSharp', 'fsharp'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/fsharp/fsharp'], resolve, reject);
-			});
-		} else {
-			return import('./fsharp');
-		}
-	}
+	loader: () => import('./fsharp')
 });
diff --git a/src/basic-languages/go/go.contribution.ts b/src/basic-languages/go/go.contribution.ts
index 353a5bd3..1ee8d4bb 100644
--- a/src/basic-languages/go/go.contribution.ts
+++ b/src/basic-languages/go/go.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'go',
 	extensions: ['.go'],
 	aliases: ['Go'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/go/go'], resolve, reject);
-			});
-		} else {
-			return import('./go');
-		}
-	}
+	loader: () => import('./go')
 });
diff --git a/src/basic-languages/graphql/graphql.contribution.ts b/src/basic-languages/graphql/graphql.contribution.ts
index 3f77dc27..7fa911c9 100644
--- a/src/basic-languages/graphql/graphql.contribution.ts
+++ b/src/basic-languages/graphql/graphql.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'graphql',
 	extensions: ['.graphql', '.gql'],
 	aliases: ['GraphQL', 'graphql', 'gql'],
 	mimetypes: ['application/graphql'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/graphql/graphql'], resolve, reject);
-			});
-		} else {
-			return import('./graphql');
-		}
-	}
+	loader: () => import('./graphql')
 });
diff --git a/src/basic-languages/handlebars/handlebars.contribution.ts b/src/basic-languages/handlebars/handlebars.contribution.ts
index 9195c7e5..68481549 100644
--- a/src/basic-languages/handlebars/handlebars.contribution.ts
+++ b/src/basic-languages/handlebars/handlebars.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'handlebars',
 	extensions: ['.handlebars', '.hbs'],
 	aliases: ['Handlebars', 'handlebars', 'hbs'],
 	mimetypes: ['text/x-handlebars-template'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/handlebars/handlebars'], resolve, reject);
-			});
-		} else {
-			return import('./handlebars');
-		}
-	}
+	loader: () => import('./handlebars')
 });
diff --git a/src/basic-languages/hcl/hcl.contribution.ts b/src/basic-languages/hcl/hcl.contribution.ts
index 38a1165c..116f4fc6 100644
--- a/src/basic-languages/hcl/hcl.contribution.ts
+++ b/src/basic-languages/hcl/hcl.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'hcl',
 	extensions: ['.tf', '.tfvars', '.hcl'],
 	aliases: ['Terraform', 'tf', 'HCL', 'hcl'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/hcl/hcl'], resolve, reject);
-			});
-		} else {
-			return import('./hcl');
-		}
-	}
+	loader: () => import('./hcl')
 });
diff --git a/src/basic-languages/html/html.contribution.ts b/src/basic-languages/html/html.contribution.ts
index 2bed4d8c..3a943078 100644
--- a/src/basic-languages/html/html.contribution.ts
+++ b/src/basic-languages/html/html.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'html',
 	extensions: ['.html', '.htm', '.shtml', '.xhtml', '.mdoc', '.jsp', '.asp', '.aspx', '.jshtm'],
 	aliases: ['HTML', 'htm', 'html', 'xhtml'],
 	mimetypes: ['text/html', 'text/x-jshtm', 'text/template', 'text/ng-template'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/html/html'], resolve, reject);
-			});
-		} else {
-			return import('./html');
-		}
-	}
+	loader: () => import('./html')
 });
diff --git a/src/basic-languages/ini/ini.contribution.ts b/src/basic-languages/ini/ini.contribution.ts
index 1944a883..7ca9805f 100644
--- a/src/basic-languages/ini/ini.contribution.ts
+++ b/src/basic-languages/ini/ini.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'ini',
 	extensions: ['.ini', '.properties', '.gitconfig'],
 	filenames: ['config', '.gitattributes', '.gitconfig', '.editorconfig'],
 	aliases: ['Ini', 'ini'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/ini/ini'], resolve, reject);
-			});
-		} else {
-			return import('./ini');
-		}
-	}
+	loader: () => import('./ini')
 });
diff --git a/src/basic-languages/java/java.contribution.ts b/src/basic-languages/java/java.contribution.ts
index 35933718..0254c6e5 100644
--- a/src/basic-languages/java/java.contribution.ts
+++ b/src/basic-languages/java/java.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'java',
 	extensions: ['.java', '.jav'],
 	aliases: ['Java', 'java'],
 	mimetypes: ['text/x-java-source', 'text/x-java'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/java/java'], resolve, reject);
-			});
-		} else {
-			return import('./java');
-		}
-	}
+	loader: () => import('./java')
 });
diff --git a/src/basic-languages/javascript/javascript.contribution.ts b/src/basic-languages/javascript/javascript.contribution.ts
index 112c2632..6a953227 100644
--- a/src/basic-languages/javascript/javascript.contribution.ts
+++ b/src/basic-languages/javascript/javascript.contribution.ts
@@ -5,9 +5,6 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'javascript',
 	extensions: ['.js', '.es6', '.jsx', '.mjs', '.cjs'],
@@ -15,13 +12,5 @@ registerLanguage({
 	filenames: ['jakefile'],
 	aliases: ['JavaScript', 'javascript', 'js'],
 	mimetypes: ['text/javascript'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/javascript/javascript'], resolve, reject);
-			});
-		} else {
-			return import('./javascript');
-		}
-	}
+	loader: () => import('./javascript')
 });
diff --git a/src/basic-languages/julia/julia.contribution.ts b/src/basic-languages/julia/julia.contribution.ts
index b25f2506..76f2780e 100644
--- a/src/basic-languages/julia/julia.contribution.ts
+++ b/src/basic-languages/julia/julia.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'julia',
 	extensions: ['.jl'],
 	aliases: ['julia', 'Julia'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/julia/julia'], resolve, reject);
-			});
-		} else {
-			return import('./julia');
-		}
-	}
+	loader: () => import('./julia')
 });
diff --git a/src/basic-languages/kotlin/kotlin.contribution.ts b/src/basic-languages/kotlin/kotlin.contribution.ts
index fa6ce3ac..0807bd12 100644
--- a/src/basic-languages/kotlin/kotlin.contribution.ts
+++ b/src/basic-languages/kotlin/kotlin.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'kotlin',
 	extensions: ['.kt', '.kts'],
 	aliases: ['Kotlin', 'kotlin'],
 	mimetypes: ['text/x-kotlin-source', 'text/x-kotlin'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/kotlin/kotlin'], resolve, reject);
-			});
-		} else {
-			return import('./kotlin');
-		}
-	}
+	loader: () => import('./kotlin')
 });
diff --git a/src/basic-languages/less/less.contribution.ts b/src/basic-languages/less/less.contribution.ts
index cfcffea8..ed5b380a 100644
--- a/src/basic-languages/less/less.contribution.ts
+++ b/src/basic-languages/less/less.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'less',
 	extensions: ['.less'],
 	aliases: ['Less', 'less'],
 	mimetypes: ['text/x-less', 'text/less'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/less/less'], resolve, reject);
-			});
-		} else {
-			return import('./less');
-		}
-	}
+	loader: () => import('./less')
 });
diff --git a/src/basic-languages/lexon/lexon.contribution.ts b/src/basic-languages/lexon/lexon.contribution.ts
index a56609e5..3ff3b84f 100644
--- a/src/basic-languages/lexon/lexon.contribution.ts
+++ b/src/basic-languages/lexon/lexon.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'lexon',
 	extensions: ['.lex'],
 	aliases: ['Lexon'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/lexon/lexon'], resolve, reject);
-			});
-		} else {
-			return import('./lexon');
-		}
-	}
+	loader: () => import('./lexon')
 });
diff --git a/src/basic-languages/liquid/liquid.contribution.ts b/src/basic-languages/liquid/liquid.contribution.ts
index 80f2134e..e4c14a62 100644
--- a/src/basic-languages/liquid/liquid.contribution.ts
+++ b/src/basic-languages/liquid/liquid.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'liquid',
 	extensions: ['.liquid', '.html.liquid'],
 	aliases: ['Liquid', 'liquid'],
 	mimetypes: ['application/liquid'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/liquid/liquid'], resolve, reject);
-			});
-		} else {
-			return import('./liquid');
-		}
-	}
+	loader: () => import('./liquid')
 });
diff --git a/src/basic-languages/lua/lua.contribution.ts b/src/basic-languages/lua/lua.contribution.ts
index 395c8237..f88a08d5 100644
--- a/src/basic-languages/lua/lua.contribution.ts
+++ b/src/basic-languages/lua/lua.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'lua',
 	extensions: ['.lua'],
 	aliases: ['Lua', 'lua'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/lua/lua'], resolve, reject);
-			});
-		} else {
-			return import('./lua');
-		}
-	}
+	loader: () => import('./lua')
 });
diff --git a/src/basic-languages/m3/m3.contribution.ts b/src/basic-languages/m3/m3.contribution.ts
index 6e2cbd34..bbb84fb1 100644
--- a/src/basic-languages/m3/m3.contribution.ts
+++ b/src/basic-languages/m3/m3.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'm3',
 	extensions: ['.m3', '.i3', '.mg', '.ig'],
 	aliases: ['Modula-3', 'Modula3', 'modula3', 'm3'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/m3/m3'], resolve, reject);
-			});
-		} else {
-			return import('./m3');
-		}
-	}
+	loader: () => import('./m3')
 });
diff --git a/src/basic-languages/markdown/markdown.contribution.ts b/src/basic-languages/markdown/markdown.contribution.ts
index 18583a4c..e13fd47e 100644
--- a/src/basic-languages/markdown/markdown.contribution.ts
+++ b/src/basic-languages/markdown/markdown.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'markdown',
 	extensions: ['.md', '.markdown', '.mdown', '.mkdn', '.mkd', '.mdwn', '.mdtxt', '.mdtext'],
 	aliases: ['Markdown', 'markdown'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/markdown/markdown'], resolve, reject);
-			});
-		} else {
-			return import('./markdown');
-		}
-	}
+	loader: () => import('./markdown')
 });
diff --git a/src/basic-languages/mdx/mdx.contribution.ts b/src/basic-languages/mdx/mdx.contribution.ts
index c435bfcf..7aa428cd 100644
--- a/src/basic-languages/mdx/mdx.contribution.ts
+++ b/src/basic-languages/mdx/mdx.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'mdx',
 	extensions: ['.mdx'],
 	aliases: ['MDX', 'mdx'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/mdx/mdx'], resolve, reject);
-			});
-		} else {
-			return import('./mdx');
-		}
-	}
+	loader: () => import('./mdx')
 });
diff --git a/src/basic-languages/mips/mips.contribution.ts b/src/basic-languages/mips/mips.contribution.ts
index 2fb0f63c..e115abee 100644
--- a/src/basic-languages/mips/mips.contribution.ts
+++ b/src/basic-languages/mips/mips.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'mips',
 	extensions: ['.s'],
 	aliases: ['MIPS', 'MIPS-V'],
 	mimetypes: ['text/x-mips', 'text/mips', 'text/plaintext'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/mips/mips'], resolve, reject);
-			});
-		} else {
-			return import('./mips');
-		}
-	}
+	loader: () => import('./mips')
 });
diff --git a/src/basic-languages/msdax/msdax.contribution.ts b/src/basic-languages/msdax/msdax.contribution.ts
index a9e25c82..b1737dab 100644
--- a/src/basic-languages/msdax/msdax.contribution.ts
+++ b/src/basic-languages/msdax/msdax.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'msdax',
 	extensions: ['.dax', '.msdax'],
 	aliases: ['DAX', 'MSDAX'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/msdax/msdax'], resolve, reject);
-			});
-		} else {
-			return import('./msdax');
-		}
-	}
+	loader: () => import('./msdax')
 });
diff --git a/src/basic-languages/mysql/mysql.contribution.ts b/src/basic-languages/mysql/mysql.contribution.ts
index 23c04ea2..c8f12626 100644
--- a/src/basic-languages/mysql/mysql.contribution.ts
+++ b/src/basic-languages/mysql/mysql.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'mysql',
 	extensions: [],
 	aliases: ['MySQL', 'mysql'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/mysql/mysql'], resolve, reject);
-			});
-		} else {
-			return import('./mysql');
-		}
-	}
+	loader: () => import('./mysql')
 });
diff --git a/src/basic-languages/objective-c/objective-c.contribution.ts b/src/basic-languages/objective-c/objective-c.contribution.ts
index f397fbc3..27c4db39 100644
--- a/src/basic-languages/objective-c/objective-c.contribution.ts
+++ b/src/basic-languages/objective-c/objective-c.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'objective-c',
 	extensions: ['.m'],
 	aliases: ['Objective-C'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/objective-c/objective-c'], resolve, reject);
-			});
-		} else {
-			return import('./objective-c');
-		}
-	}
+	loader: () => import('./objective-c')
 });
diff --git a/src/basic-languages/pascal/pascal.contribution.ts b/src/basic-languages/pascal/pascal.contribution.ts
index 7aebf79c..62babbee 100644
--- a/src/basic-languages/pascal/pascal.contribution.ts
+++ b/src/basic-languages/pascal/pascal.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'pascal',
 	extensions: ['.pas', '.p', '.pp'],
 	aliases: ['Pascal', 'pas'],
 	mimetypes: ['text/x-pascal-source', 'text/x-pascal'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/pascal/pascal'], resolve, reject);
-			});
-		} else {
-			return import('./pascal');
-		}
-	}
+	loader: () => import('./pascal')
 });
diff --git a/src/basic-languages/pascaligo/pascaligo.contribution.ts b/src/basic-languages/pascaligo/pascaligo.contribution.ts
index 1d7e0922..58cc0bb8 100644
--- a/src/basic-languages/pascaligo/pascaligo.contribution.ts
+++ b/src/basic-languages/pascaligo/pascaligo.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'pascaligo',
 	extensions: ['.ligo'],
 	aliases: ['Pascaligo', 'ligo'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/pascaligo/pascaligo'], resolve, reject);
-			});
-		} else {
-			return import('./pascaligo');
-		}
-	}
+	loader: () => import('./pascaligo')
 });
diff --git a/src/basic-languages/perl/perl.contribution.ts b/src/basic-languages/perl/perl.contribution.ts
index 2d1ace18..e5c1b731 100644
--- a/src/basic-languages/perl/perl.contribution.ts
+++ b/src/basic-languages/perl/perl.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'perl',
 	extensions: ['.pl', '.pm'],
 	aliases: ['Perl', 'pl'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/perl/perl'], resolve, reject);
-			});
-		} else {
-			return import('./perl');
-		}
-	}
+	loader: () => import('./perl')
 });
diff --git a/src/basic-languages/pgsql/pgsql.contribution.ts b/src/basic-languages/pgsql/pgsql.contribution.ts
index a4e825e0..1eff0966 100644
--- a/src/basic-languages/pgsql/pgsql.contribution.ts
+++ b/src/basic-languages/pgsql/pgsql.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'pgsql',
 	extensions: [],
 	aliases: ['PostgreSQL', 'postgres', 'pg', 'postgre'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/pgsql/pgsql'], resolve, reject);
-			});
-		} else {
-			return import('./pgsql');
-		}
-	}
+	loader: () => import('./pgsql')
 });
diff --git a/src/basic-languages/php/php.contribution.ts b/src/basic-languages/php/php.contribution.ts
index b9f3b569..51b28a8b 100644
--- a/src/basic-languages/php/php.contribution.ts
+++ b/src/basic-languages/php/php.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'php',
 	extensions: ['.php', '.php4', '.php5', '.phtml', '.ctp'],
 	aliases: ['PHP', 'php'],
 	mimetypes: ['application/x-php'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/php/php'], resolve, reject);
-			});
-		} else {
-			return import('./php');
-		}
-	}
+	loader: () => import('./php')
 });
diff --git a/src/basic-languages/pla/pla.contribution.ts b/src/basic-languages/pla/pla.contribution.ts
index 8bf7695b..9a3b13e9 100644
--- a/src/basic-languages/pla/pla.contribution.ts
+++ b/src/basic-languages/pla/pla.contribution.ts
@@ -5,19 +5,8 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'pla',
 	extensions: ['.pla'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/pla/pla'], resolve, reject);
-			});
-		} else {
-			return import('./pla');
-		}
-	}
+	loader: () => import('./pla')
 });
diff --git a/src/basic-languages/postiats/postiats.contribution.ts b/src/basic-languages/postiats/postiats.contribution.ts
index 037c624f..a57faf37 100644
--- a/src/basic-languages/postiats/postiats.contribution.ts
+++ b/src/basic-languages/postiats/postiats.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'postiats',
 	extensions: ['.dats', '.sats', '.hats'],
 	aliases: ['ATS', 'ATS/Postiats'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/postiats/postiats'], resolve, reject);
-			});
-		} else {
-			return import('./postiats');
-		}
-	}
+	loader: () => import('./postiats')
 });
diff --git a/src/basic-languages/powerquery/powerquery.contribution.ts b/src/basic-languages/powerquery/powerquery.contribution.ts
index 2e1f77a9..2c2b84a5 100644
--- a/src/basic-languages/powerquery/powerquery.contribution.ts
+++ b/src/basic-languages/powerquery/powerquery.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'powerquery',
 	extensions: ['.pq', '.pqm'],
 	aliases: ['PQ', 'M', 'Power Query', 'Power Query M'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/powerquery/powerquery'], resolve, reject);
-			});
-		} else {
-			return import('./powerquery');
-		}
-	}
+	loader: () => import('./powerquery')
 });
diff --git a/src/basic-languages/powershell/powershell.contribution.ts b/src/basic-languages/powershell/powershell.contribution.ts
index 0e5096f7..ad2878e5 100644
--- a/src/basic-languages/powershell/powershell.contribution.ts
+++ b/src/basic-languages/powershell/powershell.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'powershell',
 	extensions: ['.ps1', '.psm1', '.psd1'],
 	aliases: ['PowerShell', 'powershell', 'ps', 'ps1'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/powershell/powershell'], resolve, reject);
-			});
-		} else {
-			return import('./powershell');
-		}
-	}
+	loader: () => import('./powershell')
 });
diff --git a/src/basic-languages/protobuf/protobuf.contribution.ts b/src/basic-languages/protobuf/protobuf.contribution.ts
index 5a974827..3741ba94 100644
--- a/src/basic-languages/protobuf/protobuf.contribution.ts
+++ b/src/basic-languages/protobuf/protobuf.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'proto',
 	extensions: ['.proto'],
 	aliases: ['protobuf', 'Protocol Buffers'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/protobuf/protobuf'], resolve, reject);
-			});
-		} else {
-			return import('./protobuf');
-		}
-	}
+	loader: () => import('./protobuf')
 });
diff --git a/src/basic-languages/pug/pug.contribution.ts b/src/basic-languages/pug/pug.contribution.ts
index 07f7b733..d097ee30 100644
--- a/src/basic-languages/pug/pug.contribution.ts
+++ b/src/basic-languages/pug/pug.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'pug',
 	extensions: ['.jade', '.pug'],
 	aliases: ['Pug', 'Jade', 'jade'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/pug/pug'], resolve, reject);
-			});
-		} else {
-			return import('./pug');
-		}
-	}
+	loader: () => import('./pug')
 });
diff --git a/src/basic-languages/python/python.contribution.ts b/src/basic-languages/python/python.contribution.ts
index 82985dd8..47969bdb 100644
--- a/src/basic-languages/python/python.contribution.ts
+++ b/src/basic-languages/python/python.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'python',
 	extensions: ['.py', '.rpy', '.pyw', '.cpy', '.gyp', '.gypi'],
 	aliases: ['Python', 'py'],
 	firstLine: '^#!/.*\\bpython[0-9.-]*\\b',
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/python/python'], resolve, reject);
-			});
-		} else {
-			return import('./python');
-		}
-	}
+	loader: () => import('./python')
 });
diff --git a/src/basic-languages/qsharp/qsharp.contribution.ts b/src/basic-languages/qsharp/qsharp.contribution.ts
index 111678bb..09c59b38 100644
--- a/src/basic-languages/qsharp/qsharp.contribution.ts
+++ b/src/basic-languages/qsharp/qsharp.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'qsharp',
 	extensions: ['.qs'],
 	aliases: ['Q#', 'qsharp'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/qsharp/qsharp'], resolve, reject);
-			});
-		} else {
-			return import('./qsharp');
-		}
-	}
+	loader: () => import('./qsharp')
 });
diff --git a/src/basic-languages/r/r.contribution.ts b/src/basic-languages/r/r.contribution.ts
index 07bcb334..d8062665 100644
--- a/src/basic-languages/r/r.contribution.ts
+++ b/src/basic-languages/r/r.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'r',
 	extensions: ['.r', '.rhistory', '.rmd', '.rprofile', '.rt'],
 	aliases: ['R', 'r'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/r/r'], resolve, reject);
-			});
-		} else {
-			return import('./r');
-		}
-	}
+	loader: () => import('./r')
 });
diff --git a/src/basic-languages/razor/razor.contribution.ts b/src/basic-languages/razor/razor.contribution.ts
index 94017d3c..57c2d479 100644
--- a/src/basic-languages/razor/razor.contribution.ts
+++ b/src/basic-languages/razor/razor.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'razor',
 	extensions: ['.cshtml'],
 	aliases: ['Razor', 'razor'],
 	mimetypes: ['text/x-cshtml'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/razor/razor'], resolve, reject);
-			});
-		} else {
-			return import('./razor');
-		}
-	}
+	loader: () => import('./razor')
 });
diff --git a/src/basic-languages/redis/redis.contribution.ts b/src/basic-languages/redis/redis.contribution.ts
index c0f55bd6..5bf1367f 100644
--- a/src/basic-languages/redis/redis.contribution.ts
+++ b/src/basic-languages/redis/redis.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'redis',
 	extensions: ['.redis'],
 	aliases: ['redis'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/redis/redis'], resolve, reject);
-			});
-		} else {
-			return import('./redis');
-		}
-	}
+	loader: () => import('./redis')
 });
diff --git a/src/basic-languages/redshift/redshift.contribution.ts b/src/basic-languages/redshift/redshift.contribution.ts
index 4287adb4..419b9203 100644
--- a/src/basic-languages/redshift/redshift.contribution.ts
+++ b/src/basic-languages/redshift/redshift.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'redshift',
 	extensions: [],
 	aliases: ['Redshift', 'redshift'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/redshift/redshift'], resolve, reject);
-			});
-		} else {
-			return import('./redshift');
-		}
-	}
+	loader: () => import('./redshift')
 });
diff --git a/src/basic-languages/restructuredtext/restructuredtext.contribution.ts b/src/basic-languages/restructuredtext/restructuredtext.contribution.ts
index b8a937e1..28c77b34 100644
--- a/src/basic-languages/restructuredtext/restructuredtext.contribution.ts
+++ b/src/basic-languages/restructuredtext/restructuredtext.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'restructuredtext',
 	extensions: ['.rst'],
 	aliases: ['reStructuredText', 'restructuredtext'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/restructuredtext/restructuredtext'], resolve, reject);
-			});
-		} else {
-			return import('./restructuredtext');
-		}
-	}
+	loader: () => import('./restructuredtext')
 });
diff --git a/src/basic-languages/ruby/ruby.contribution.ts b/src/basic-languages/ruby/ruby.contribution.ts
index 9fe76b1f..8c97bc7d 100644
--- a/src/basic-languages/ruby/ruby.contribution.ts
+++ b/src/basic-languages/ruby/ruby.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'ruby',
 	extensions: ['.rb', '.rbx', '.rjs', '.gemspec', '.pp'],
 	filenames: ['rakefile', 'Gemfile'],
 	aliases: ['Ruby', 'rb'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/ruby/ruby'], resolve, reject);
-			});
-		} else {
-			return import('./ruby');
-		}
-	}
+	loader: () => import('./ruby')
 });
diff --git a/src/basic-languages/rust/rust.contribution.ts b/src/basic-languages/rust/rust.contribution.ts
index e09006d2..972f6b15 100644
--- a/src/basic-languages/rust/rust.contribution.ts
+++ b/src/basic-languages/rust/rust.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'rust',
 	extensions: ['.rs', '.rlib'],
 	aliases: ['Rust', 'rust'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/rust/rust'], resolve, reject);
-			});
-		} else {
-			return import('./rust');
-		}
-	}
+	loader: () => import('./rust')
 });
diff --git a/src/basic-languages/sb/sb.contribution.ts b/src/basic-languages/sb/sb.contribution.ts
index 91448eca..c2e8777f 100644
--- a/src/basic-languages/sb/sb.contribution.ts
+++ b/src/basic-languages/sb/sb.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'sb',
 	extensions: ['.sb'],
 	aliases: ['Small Basic', 'sb'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/sb/sb'], resolve, reject);
-			});
-		} else {
-			return import('./sb');
-		}
-	}
+	loader: () => import('./sb')
 });
diff --git a/src/basic-languages/scala/scala.contribution.ts b/src/basic-languages/scala/scala.contribution.ts
index b39b022b..ec15ca9f 100644
--- a/src/basic-languages/scala/scala.contribution.ts
+++ b/src/basic-languages/scala/scala.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'scala',
 	extensions: ['.scala', '.sc', '.sbt'],
 	aliases: ['Scala', 'scala', 'SBT', 'Sbt', 'sbt', 'Dotty', 'dotty'],
 	mimetypes: ['text/x-scala-source', 'text/x-scala', 'text/x-sbt', 'text/x-dotty'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/scala/scala'], resolve, reject);
-			});
-		} else {
-			return import('./scala');
-		}
-	}
+	loader: () => import('./scala')
 });
diff --git a/src/basic-languages/scheme/scheme.contribution.ts b/src/basic-languages/scheme/scheme.contribution.ts
index 959610c7..f2793760 100644
--- a/src/basic-languages/scheme/scheme.contribution.ts
+++ b/src/basic-languages/scheme/scheme.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'scheme',
 	extensions: ['.scm', '.ss', '.sch', '.rkt'],
 	aliases: ['scheme', 'Scheme'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/scheme/scheme'], resolve, reject);
-			});
-		} else {
-			return import('./scheme');
-		}
-	}
+	loader: () => import('./scheme')
 });
diff --git a/src/basic-languages/scss/scss.contribution.ts b/src/basic-languages/scss/scss.contribution.ts
index 09589f4a..1c5b99a0 100644
--- a/src/basic-languages/scss/scss.contribution.ts
+++ b/src/basic-languages/scss/scss.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'scss',
 	extensions: ['.scss'],
 	aliases: ['Sass', 'sass', 'scss'],
 	mimetypes: ['text/x-scss', 'text/scss'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/scss/scss'], resolve, reject);
-			});
-		} else {
-			return import('./scss');
-		}
-	}
+	loader: () => import('./scss')
 });
diff --git a/src/basic-languages/shell/shell.contribution.ts b/src/basic-languages/shell/shell.contribution.ts
index be7fd3e1..3e899a08 100644
--- a/src/basic-languages/shell/shell.contribution.ts
+++ b/src/basic-languages/shell/shell.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'shell',
 	extensions: ['.sh', '.bash'],
 	aliases: ['Shell', 'sh'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/shell/shell'], resolve, reject);
-			});
-		} else {
-			return import('./shell');
-		}
-	}
+	loader: () => import('./shell')
 });
diff --git a/src/basic-languages/solidity/solidity.contribution.ts b/src/basic-languages/solidity/solidity.contribution.ts
index 80bb12fb..5f2837f6 100644
--- a/src/basic-languages/solidity/solidity.contribution.ts
+++ b/src/basic-languages/solidity/solidity.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'sol',
 	extensions: ['.sol'],
 	aliases: ['sol', 'solidity', 'Solidity'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/solidity/solidity'], resolve, reject);
-			});
-		} else {
-			return import('./solidity');
-		}
-	}
+	loader: () => import('./solidity')
 });
diff --git a/src/basic-languages/sophia/sophia.contribution.ts b/src/basic-languages/sophia/sophia.contribution.ts
index 80f744a5..0190f17e 100644
--- a/src/basic-languages/sophia/sophia.contribution.ts
+++ b/src/basic-languages/sophia/sophia.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'aes',
 	extensions: ['.aes'],
 	aliases: ['aes', 'sophia', 'Sophia'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/sophia/sophia'], resolve, reject);
-			});
-		} else {
-			return import('./sophia');
-		}
-	}
+	loader: () => import('./sophia')
 });
diff --git a/src/basic-languages/sparql/sparql.contribution.ts b/src/basic-languages/sparql/sparql.contribution.ts
index 830f4043..3a581e3e 100644
--- a/src/basic-languages/sparql/sparql.contribution.ts
+++ b/src/basic-languages/sparql/sparql.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'sparql',
 	extensions: ['.rq'],
 	aliases: ['sparql', 'SPARQL'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/sparql/sparql'], resolve, reject);
-			});
-		} else {
-			return import('./sparql');
-		}
-	}
+	loader: () => import('./sparql')
 });
diff --git a/src/basic-languages/sql/sql.contribution.ts b/src/basic-languages/sql/sql.contribution.ts
index ccfae915..5d20439d 100644
--- a/src/basic-languages/sql/sql.contribution.ts
+++ b/src/basic-languages/sql/sql.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'sql',
 	extensions: ['.sql'],
 	aliases: ['SQL'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/sql/sql'], resolve, reject);
-			});
-		} else {
-			return import('./sql');
-		}
-	}
+	loader: () => import('./sql')
 });
diff --git a/src/basic-languages/st/st.contribution.ts b/src/basic-languages/st/st.contribution.ts
index b6811c7a..398eef8a 100644
--- a/src/basic-languages/st/st.contribution.ts
+++ b/src/basic-languages/st/st.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'st',
 	extensions: ['.st', '.iecst', '.iecplc', '.lc3lib', '.TcPOU', '.TcDUT', '.TcGVL', '.TcIO'],
 	aliases: ['StructuredText', 'scl', 'stl'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/st/st'], resolve, reject);
-			});
-		} else {
-			return import('./st');
-		}
-	}
+	loader: () => import('./st')
 });
diff --git a/src/basic-languages/swift/swift.contribution.ts b/src/basic-languages/swift/swift.contribution.ts
index 14228182..3fa39b88 100644
--- a/src/basic-languages/swift/swift.contribution.ts
+++ b/src/basic-languages/swift/swift.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'swift',
 	aliases: ['Swift', 'swift'],
 	extensions: ['.swift'],
 	mimetypes: ['text/swift'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/swift/swift'], resolve, reject);
-			});
-		} else {
-			return import('./swift');
-		}
-	}
+	loader: () => import('./swift')
 });
diff --git a/src/basic-languages/systemverilog/systemverilog.contribution.ts b/src/basic-languages/systemverilog/systemverilog.contribution.ts
index 37a942d0..f8fbfc7f 100644
--- a/src/basic-languages/systemverilog/systemverilog.contribution.ts
+++ b/src/basic-languages/systemverilog/systemverilog.contribution.ts
@@ -5,35 +5,16 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'systemverilog',
 	extensions: ['.sv', '.svh'],
 	aliases: ['SV', 'sv', 'SystemVerilog', 'systemverilog'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/systemverilog/systemverilog'], resolve, reject);
-			});
-		} else {
-			return import('./systemverilog');
-		}
-	}
+	loader: () => import('./systemverilog')
 });
 
 registerLanguage({
 	id: 'verilog',
 	extensions: ['.v', '.vh'],
 	aliases: ['V', 'v', 'Verilog', 'verilog'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/systemverilog/systemverilog'], resolve, reject);
-			});
-		} else {
-			return import('./systemverilog');
-		}
-	}
+	loader: () => import('./systemverilog')
 });
diff --git a/src/basic-languages/tcl/tcl.contribution.ts b/src/basic-languages/tcl/tcl.contribution.ts
index 7535b9cc..dca4c4f8 100644
--- a/src/basic-languages/tcl/tcl.contribution.ts
+++ b/src/basic-languages/tcl/tcl.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'tcl',
 	extensions: ['.tcl'],
 	aliases: ['tcl', 'Tcl', 'tcltk', 'TclTk', 'tcl/tk', 'Tcl/Tk'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/tcl/tcl'], resolve, reject);
-			});
-		} else {
-			return import('./tcl');
-		}
-	}
+	loader: () => import('./tcl')
 });
diff --git a/src/basic-languages/twig/twig.contribution.ts b/src/basic-languages/twig/twig.contribution.ts
index 0a758d37..2aa4d53c 100644
--- a/src/basic-languages/twig/twig.contribution.ts
+++ b/src/basic-languages/twig/twig.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'twig',
 	extensions: ['.twig'],
 	aliases: ['Twig', 'twig'],
 	mimetypes: ['text/x-twig'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/twig/twig'], resolve, reject);
-			});
-		} else {
-			return import('./twig');
-		}
-	}
+	loader: () => import('./twig')
 });
diff --git a/src/basic-languages/typescript/typescript.contribution.ts b/src/basic-languages/typescript/typescript.contribution.ts
index 8627f521..90694a3e 100644
--- a/src/basic-languages/typescript/typescript.contribution.ts
+++ b/src/basic-languages/typescript/typescript.contribution.ts
@@ -5,21 +5,12 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'typescript',
 	extensions: ['.ts', '.tsx', '.cts', '.mts'],
 	aliases: ['TypeScript', 'ts', 'typescript'],
 	mimetypes: ['text/typescript'],
 	loader: (): Promise<any> => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/typescript/typescript'], resolve, reject);
-			});
-		} else {
-			return import('./typescript');
-		}
+		return import('./typescript');
 	}
 });
diff --git a/src/basic-languages/typespec/typespec.contribution.ts b/src/basic-languages/typespec/typespec.contribution.ts
index 5f81e2dd..cc324aa9 100644
--- a/src/basic-languages/typespec/typespec.contribution.ts
+++ b/src/basic-languages/typespec/typespec.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'typespec',
 	extensions: ['.tsp'],
 	aliases: ['TypeSpec'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/typespec/typespec'], resolve, reject);
-			});
-		} else {
-			return import('./typespec');
-		}
-	}
+	loader: () => import('./typespec')
 });
diff --git a/src/basic-languages/vb/vb.contribution.ts b/src/basic-languages/vb/vb.contribution.ts
index 383e3c85..9cf06059 100644
--- a/src/basic-languages/vb/vb.contribution.ts
+++ b/src/basic-languages/vb/vb.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'vb',
 	extensions: ['.vb'],
 	aliases: ['Visual Basic', 'vb'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/vb/vb'], resolve, reject);
-			});
-		} else {
-			return import('./vb');
-		}
-	}
+	loader: () => import('./vb')
 });
diff --git a/src/basic-languages/wgsl/wgsl.contribution.ts b/src/basic-languages/wgsl/wgsl.contribution.ts
index 10802ffd..7befb7b4 100644
--- a/src/basic-languages/wgsl/wgsl.contribution.ts
+++ b/src/basic-languages/wgsl/wgsl.contribution.ts
@@ -5,20 +5,9 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'wgsl',
 	extensions: ['.wgsl'],
 	aliases: ['WebGPU Shading Language', 'WGSL', 'wgsl'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/wgsl/wgsl'], resolve, reject);
-			});
-		} else {
-			return import('./wgsl');
-		}
-	}
+	loader: () => import('./wgsl')
 });
diff --git a/src/basic-languages/xml/xml.contribution.ts b/src/basic-languages/xml/xml.contribution.ts
index 1a58c066..30d25d38 100644
--- a/src/basic-languages/xml/xml.contribution.ts
+++ b/src/basic-languages/xml/xml.contribution.ts
@@ -5,9 +5,6 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'xml',
 	extensions: [
@@ -32,13 +29,5 @@ registerLanguage({
 	firstLine: '(\\<\\?xml.*)|(\\<svg)|(\\<\\!doctype\\s+svg)',
 	aliases: ['XML', 'xml'],
 	mimetypes: ['text/xml', 'application/xml', 'application/xaml+xml', 'application/xml-dtd'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/xml/xml'], resolve, reject);
-			});
-		} else {
-			return import('./xml');
-		}
-	}
+	loader: () => import('./xml')
 });
diff --git a/src/basic-languages/yaml/yaml.contribution.ts b/src/basic-languages/yaml/yaml.contribution.ts
index db8cf27f..ff941e0f 100644
--- a/src/basic-languages/yaml/yaml.contribution.ts
+++ b/src/basic-languages/yaml/yaml.contribution.ts
@@ -5,21 +5,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-declare var AMD: any;
-declare var require: any;
-
 registerLanguage({
 	id: 'yaml',
 	extensions: ['.yaml', '.yml'],
 	aliases: ['YAML', 'yaml', 'YML', 'yml'],
 	mimetypes: ['application/x-yaml', 'text/x-yaml'],
-	loader: () => {
-		if (AMD) {
-			return new Promise((resolve, reject) => {
-				require(['vs/basic-languages/yaml/yaml'], resolve, reject);
-			});
-		} else {
-			return import('./yaml');
-		}
-	}
+	loader: () => import('./yaml')
 });
diff --git a/src/language/css/monaco.contribution.ts b/src/language/css/monaco.contribution.ts
index e935f86d..f00e8f32 100644
--- a/src/language/css/monaco.contribution.ts
+++ b/src/language/css/monaco.contribution.ts
@@ -258,17 +258,8 @@ export const lessDefaults: LanguageServiceDefaults = new LanguageServiceDefaults
 
 // --- Registration to monaco editor ---
 
-declare var AMD: any;
-declare var require: any;
-
 function getMode(): Promise<typeof mode> {
-	if (AMD) {
-		return new Promise((resolve, reject) => {
-			require(['vs/language/css/cssMode'], resolve, reject);
-		});
-	} else {
-		return import('./cssMode');
-	}
+	return import('./cssMode');
 }
 
 languages.onLanguage('less', () => {
diff --git a/src/language/html/monaco.contribution.ts b/src/language/html/monaco.contribution.ts
index 7b3cbf65..67fb5ca5 100644
--- a/src/language/html/monaco.contribution.ts
+++ b/src/language/html/monaco.contribution.ts
@@ -228,17 +228,8 @@ export const razorDefaults = razorLanguageService.defaults;
 
 // --- Registration to monaco editor ---
 
-declare var AMD: any;
-declare var require: any;
-
 function getMode(): Promise<typeof mode> {
-	if (AMD) {
-		return new Promise((resolve, reject) => {
-			require(['vs/language/html/htmlMode'], resolve, reject);
-		});
-	} else {
-		return import('./htmlMode');
-	}
+	return import('./htmlMode');
 }
 
 export interface LanguageServiceRegistration extends IDisposable {
diff --git a/src/language/json/monaco.contribution.ts b/src/language/json/monaco.contribution.ts
index ae44000f..2f3b6afe 100644
--- a/src/language/json/monaco.contribution.ts
+++ b/src/language/json/monaco.contribution.ts
@@ -347,17 +347,8 @@ export const getWorker = (): Promise<(...uris: Uri[]) => Promise<IJSONWorker>> =
 
 // --- Registration to monaco editor ---
 
-declare var AMD: any;
-declare var require: any;
-
 function getMode(): Promise<typeof mode> {
-	if (AMD) {
-		return new Promise((resolve, reject) => {
-			require(['vs/language/json/jsonMode'], resolve, reject);
-		});
-	} else {
-		return import('./jsonMode');
-	}
+	return import('./jsonMode');
 }
 
 languages.register({
diff --git a/src/language/typescript/monaco.contribution.ts b/src/language/typescript/monaco.contribution.ts
index 163bb9f9..8bcf385b 100644
--- a/src/language/typescript/monaco.contribution.ts
+++ b/src/language/typescript/monaco.contribution.ts
@@ -794,17 +794,8 @@ export const getJavaScriptWorker = (): Promise<(...uris: Uri[]) => Promise<TypeS
 
 // --- Registration to monaco editor ---
 
-declare var AMD: any;
-declare var require: any;
-
 function getMode(): Promise<typeof mode> {
-	if (AMD) {
-		return new Promise((resolve, reject) => {
-			require(['vs/language/typescript/tsMode'], resolve, reject);
-		});
-	} else {
-		return import('./tsMode');
-	}
+	return import('./tsMode');
 }
 
 languages.onLanguage('typescript', () => {
diff --git a/test/manual/dev-setup.js b/test/manual/dev-setup.js
index da8747c3..3dae2fa1 100644
--- a/test/manual/dev-setup.js
+++ b/test/manual/dev-setup.js
@@ -68,8 +68,6 @@
 		PATH_PREFIX = PATH_PREFIX || '';
 
 		loadScript(`${PATH_PREFIX}${corePath}/loader.js`, () => {
-			global.AMD = true;
-
 			/** @type {{[name:string]: string;}} */
 			const loaderPathsConfig = {};
 			if (isRelease) {