diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
index de1bbbc656..ed4415786b 100644
--- a/packages/astro/src/core/build/generate.ts
+++ b/packages/astro/src/core/build/generate.ts
@@ -616,11 +616,7 @@ function createBuildManifest(
 }
 
 /**
- *
- * @param internals
- * @param path
- * @param route
- * @returns
+ * TODO: Change that – document & maybe refactor
  */
 function getEntryFilePath(internals: BuildInternals, pageData: RouteData) {
 	const id =
diff --git a/packages/astro/src/core/build/pipeline.ts b/packages/astro/src/core/build/pipeline.ts
index 141cbecadc..a2248405a4 100644
--- a/packages/astro/src/core/build/pipeline.ts
+++ b/packages/astro/src/core/build/pipeline.ts
@@ -187,7 +187,7 @@ export class BuildPipeline extends Pipeline {
 			) {
 				const [, pageName] = entrypoint.split(':');
 				console.log('pageName', pageName);
-				// TODO: Change that
+				// TODO: Change that – tmp function use only component name and not the route
 				const pageData = tmp(
 					this.internals.pagesByKeys,
 					pageName.replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, '.')
diff --git a/packages/astro/src/core/build/plugins/plugin-pages.ts b/packages/astro/src/core/build/plugins/plugin-pages.ts
index a663757248..1e897cd6fe 100644
--- a/packages/astro/src/core/build/plugins/plugin-pages.ts
+++ b/packages/astro/src/core/build/plugins/plugin-pages.ts
@@ -74,12 +74,3 @@ export function pluginPages(opts: StaticBuildOptions, internals: BuildInternals)
 		},
 	};
 }
-
-/**
- * TMP: This is a temporary function to get the page data from the pagesByKeys map.
- */
-function tmp(pagesByKeys: Map<string, any>, pageName: string) {
-	for (const pages of pagesByKeys.values()) {
-		if (pages.component == pageName) return pages;
-	}
-}
diff --git a/packages/astro/src/core/build/plugins/plugin-ssr.ts b/packages/astro/src/core/build/plugins/plugin-ssr.ts
index 6db1715b12..55b2beec98 100644
--- a/packages/astro/src/core/build/plugins/plugin-ssr.ts
+++ b/packages/astro/src/core/build/plugins/plugin-ssr.ts
@@ -172,7 +172,7 @@ function vitePluginSSRSplit(
 				const imports: string[] = [];
 				const contents: string[] = [];
 				const exports: string[] = [];
-				// TODO: Change that
+				// TODO: Change that – broken usage of getVirtualModulePageName
 				const path = getPathFromVirtualModulePageName(RESOLVED_SPLIT_MODULE_ID, id);
 				const virtualModuleName = getVirtualModulePageName(ASTRO_PAGE_MODULE_ID, path);
 				let module = await this.resolve(virtualModuleName);
diff --git a/packages/astro/test/test-utils.js b/packages/astro/test/test-utils.js
index 9d17d7f94b..b948287ebe 100644
--- a/packages/astro/test/test-utils.js
+++ b/packages/astro/test/test-utils.js
@@ -221,7 +221,7 @@ export async function loadFixture(inlineConfig) {
 			return app;
 		},
 		loadEntryPoint: async (pagePath, routes, streaming) => {
-			// TODO: Change that
+			// TODO: Change that – broken usage of getVirtualModulePageName
 			const virtualModule = getVirtualModulePageName(RESOLVED_SPLIT_MODULE_ID, pagePath);
 			const filePath = makeSplitEntryPointFileName(virtualModule, routes);
 			const url = new URL(`./server/${filePath}?id=${fixtureId}`, config.outDir);