diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index 11c32c34d9..9997ed5cbe 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -37,8 +37,6 @@
 #include <MenuPrivate.h>
 #include <MenuWindow.h>
 
-menu_info BMenu::sMenuInfo;
-
 class _ExtraMenuData_ {
 public:
 	menu_tracking_hook trackingHook;
@@ -52,6 +50,9 @@ public:
 };
 
 
+menu_info BMenu::sMenuInfo;
+
+
 static property_info
 sPropList[] = {
 	{ "Enabled", { B_GET_PROPERTY, 0 },
@@ -501,8 +502,6 @@ BMenu::FindItem(uint32 command) const
 status_t 
 BMenu::SetTargetForItems(BHandler *handler)
 {
-	// TODO: Test what beos returns here in
-	// case there are no items
 	status_t status = B_OK;
 	for (int32 i = 0; i < fItems.CountItems(); i++) {
 		status = ItemAt(i)->SetTarget(handler);
@@ -517,8 +516,6 @@ BMenu::SetTargetForItems(BHandler *handler)
 status_t
 BMenu::SetTargetForItems(BMessenger messenger)
 {
-	// TODO: Test what beos returns here in
-	// case there are no items
 	status_t status = B_OK;
 	for (int32 i = 0; i < fItems.CountItems(); i++) {
 		status = ItemAt(i)->SetTarget(messenger);