diff --git a/src/apps/readonlybootprompt/BootPromptWindow.cpp b/src/apps/readonlybootprompt/BootPromptWindow.cpp
index fa2397e05b..d78c202d7b 100644
--- a/src/apps/readonlybootprompt/BootPromptWindow.cpp
+++ b/src/apps/readonlybootprompt/BootPromptWindow.cpp
@@ -64,7 +64,7 @@ BootPromptWindow::BootPromptWindow()
 		B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_NOT_CLOSABLE
 			| B_AUTO_UPDATE_SIZE_LIMITS)
 {
-	// TODO: Remove once BLocalRoster is fixed.
+	// Get the list of all known languages (suffice to do it only once)
 	be_locale_roster->GetInstalledLanguages(&fInstalledLanguages);
 
 	fInfoTextView = new BTextView("info", be_plain_font, NULL, B_WILL_DRAW);
@@ -267,12 +267,6 @@ BootPromptWindow::_PopulateLanguages()
 //	be_locale_roster->GetInstalledCatalogs(&installedCatalogs);
 //	installedCatalogs.PrintToStream();
 
-// TODO: BLocaleRoster uses static variables!! Fix this! Or else one can only
-// call this once!
-//	// Get the list of all known languages
-//	BMessage installedLanguages;
-//	be_locale_roster->GetInstalledLanguages(&installedLanguages);
-
 	// Try to instantiate a BCatalog for each language, it will only work
 	// for translations of this application. So the list of languages will be
 	//  limited to catalogs written for this application, which is on purpose!
diff --git a/src/apps/readonlybootprompt/BootPromptWindow.h b/src/apps/readonlybootprompt/BootPromptWindow.h
index 0404dfd00f..3047261541 100644
--- a/src/apps/readonlybootprompt/BootPromptWindow.h
+++ b/src/apps/readonlybootprompt/BootPromptWindow.h
@@ -39,7 +39,6 @@ private:
 			BButton*			fDesktopButton;
 			BButton*			fInstallerButton;
 
-	// TODO: Should not be needed, see TODO in _PopulateLanguages()
 			BMessage			fInstalledLanguages;
 };