diff --git a/camino/resources/application/WebsiteDefaults.strings b/camino/resources/application/WebsiteDefaults.strings
index 3468956676c..2dd7b9d8fb0 100644
--- a/camino/resources/application/WebsiteDefaults.strings
+++ b/camino/resources/application/WebsiteDefaults.strings
@@ -1,14 +1,10 @@
 SupportPageDefault = "http://www.mozilla.org/products/camino/support/";
 HomePageDefault = "http://www.mozilla.org/projects/camino/homepage.html";
-SearchPageDefault = "http://www.google.com/";
 StartPageDefault = "http://www.mozilla.org/projects/camino/welcome.html";
 ThrobberPageDefault = "http://www.mozilla.org/projects/camino/";
 FeedbackPageDefault = "http://www.mozilla.org/projects/camino/feedback.html";
 InfoPageDefault = "http://www.mozilla.org/projects/camino/";
 RendezvousPageDefault ="http://www.zeroconf.org/webbrowsers.html";
 CorruptedBookmarksDefault = "http://www.mozilla.org/projects/camino/damagedBookmarks.html";
-
-SearchCustomPageDefault = "http://www.mozilla.org/products/camino/features/searchCustomization.html";
-TipsTricksPageDefault = "http://www.mozilla.org/products/camino/features/tipsTricks.html";
-ReleaseNotesDefault = "http://www.mozilla.org/products/camino/releases/1.0.html";
+KeyboardShortcutsPageDefault = "http://www.mozilla.org/projects/camino/shortcuts.html";
 
diff --git a/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib b/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
index 5f45dde82b9..e4464b3e051 100644
--- a/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
+++ b/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
@@ -152,6 +152,7 @@
                 goHome = id; 
                 importBookmarks = id; 
                 infoLink = id; 
+                keyboardShortcutsLink = id; 
                 makeTextBigger = id; 
                 makeTextDefaultSize = id; 
                 makeTextSmaller = id; 
@@ -165,20 +166,17 @@
                 pageSetup = id; 
                 previousTab = id; 
                 printDocument = id; 
-                releaseNoteLink = id; 
                 reload = id; 
                 reloadAllTabs = id; 
                 reloadWithCharset = id; 
                 resetBrowser = id; 
                 savePage = id; 
-                searchCustomizeLink = id; 
                 sendURL = id; 
                 setFileExtension = id; 
                 showCertificates = id; 
                 showHistory = id; 
                 stop = id; 
                 supportLink = id; 
-                tipsTricksLink = id; 
                 toggleAutoCharsetDetection = id; 
                 toggleBookmarksToolbar = id; 
                 toggleOfflineMode = id; 
@@ -203,7 +201,6 @@
                 mDockMenu = BookmarkMenu; 
                 mExportPanelView = NSView; 
                 mFilterView = NSView; 
-                mGoMenu = NSMenu; 
                 mServersSubmenu = NSMenu; 
                 mShowAllBookmarksMenuItem = NSMenuItem; 
                 mTextEncodingsMenu = NSMenu; 
diff --git a/camino/resources/localized/English.lproj/MainMenu.nib/info.nib b/camino/resources/localized/English.lproj/MainMenu.nib/info.nib
index 1c49489104d..fe0833394fb 100644
--- a/camino/resources/localized/English.lproj/MainMenu.nib/info.nib
+++ b/camino/resources/localized/English.lproj/MainMenu.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>4 6 408 289 0 0 1024 746 </string>
+	<string>3 6 408 289 0 0 1024 746 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
diff --git a/camino/resources/localized/English.lproj/MainMenu.nib/keyedobjects.nib b/camino/resources/localized/English.lproj/MainMenu.nib/keyedobjects.nib
index 3067b8c7420..704ffbbb4ca 100644
Binary files a/camino/resources/localized/English.lproj/MainMenu.nib/keyedobjects.nib and b/camino/resources/localized/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/camino/src/application/MainController.h b/camino/src/application/MainController.h
index 9a89f175463..363474a053d 100644
--- a/camino/src/application/MainController.h
+++ b/camino/src/application/MainController.h
@@ -168,11 +168,9 @@ typedef enum EBookmarkOpenBehavior
 
 // Help menu actions
 - (IBAction)supportLink:(id)aSender;
+- (IBAction)keyboardShortcutsLink:(id)aSender;
 - (IBAction)infoLink:(id)aSender;
 - (IBAction)aboutPlugins:(id)aSender;
-- (IBAction)releaseNoteLink:(id)aSender; // unused
-- (IBAction)tipsTricksLink:(id)aSender; // unused
-- (IBAction)searchCustomizeLink:(id)aSender; // unused
 
 // used by export bookmarks popup to set file extension for the resulting bookmarks file
 - (IBAction)setFileExtension:(id)aSender;