Index: apps/keymaps/keymap-m3.c
===================================================================
--- apps/keymaps/keymap-m3.c	(revision 21020)
+++ apps/keymaps/keymap-m3.c	(working copy)
@@ -74,16 +74,12 @@
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,      BUTTON_REC|BUTTON_REPEAT,      BUTTON_REC },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_settings_bmark */
+}; /* button_context_bmark */
 
 static const struct button_mapping remote_button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,      BUTTON_RC_REC|BUTTON_REPEAT,   BUTTON_RC_REC },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_settings_bmark */
+}; /* remote_button_context_bmark */
 
 /** FM Radio Screen **/
 static const struct button_mapping button_context_radio[]  = {
Index: apps/keymaps/keymap-creativezv.c
===================================================================
--- apps/keymaps/keymap-creativezv.c	(revision 21020)
+++ apps/keymaps/keymap-creativezv.c	(working copy)
@@ -168,7 +168,6 @@
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_BACK, BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-h1x0_h3x0.c
===================================================================
--- apps/keymaps/keymap-h1x0_h3x0.c	(revision 21020)
+++ apps/keymaps/keymap-h1x0_h3x0.c	(working copy)
@@ -193,15 +193,14 @@
 }; /* button_context_settings_context_eq */
 
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_REC,      BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_settings_bmark */
+}; /* button_context_bmark */
 
 static const struct button_mapping button_context_time[]  = {
     { ACTION_STD_CANCEL,       BUTTON_OFF,  BUTTON_NONE },
     { ACTION_STD_OK,           BUTTON_ON,   BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+}; /* button_context_time */
 
 static const struct button_mapping button_context_quickscreen[]  = {
     { ACTION_QS_DOWNINV,    BUTTON_UP,                      BUTTON_NONE },
@@ -498,7 +497,7 @@
 static const struct button_mapping button_context_bmark_h100remote[] = {
     { ACTION_BMS_DELETE,      BUTTON_RC_REC,    BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
-}; /* button_context_settings_bmark */
+}; /* button_context_bmark_h100remote */
 
 static const struct button_mapping *button_context_bmark_h300lcdremote =
                 button_context_bmark_h100remote;
@@ -720,7 +719,7 @@
     { ACTION_SETTINGS_INC,     BUTTON_RC_BITRATE,  BUTTON_NONE },
     { ACTION_SETTINGS_DEC,     BUTTON_RC_SOURCE,  BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+}; /* button_context_time_remote */
 
 /* the actual used tables */
 static const struct button_mapping 
Index: apps/keymaps/keymap-ifp7xx.c
===================================================================
--- apps/keymaps/keymap-ifp7xx.c	(revision 21020)
+++ apps/keymaps/keymap-ifp7xx.c	(working copy)
@@ -104,9 +104,8 @@
 }; /* button_context_settings_yesno */
 
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,      BUTTON_MODE,     BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_settings_bmark */
+}; /* button_context_bmark */
 
 static const struct button_mapping button_context_quickscreen[]  = {
     { ACTION_QS_DOWNINV,    BUTTON_UP,                      BUTTON_NONE },
Index: apps/keymaps/keymap-iaudio67.c
===================================================================
--- apps/keymaps/keymap-iaudio67.c	(revision 21020)
+++ apps/keymaps/keymap-iaudio67.c	(working copy)
@@ -266,8 +266,6 @@
 }; /* button_context_keyboard */
 
 static const struct button_mapping button_context_bmark[]  = {
-//    { ACTION_BMS_DELETE,       BUTTON_REC,                       BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-player.c
===================================================================
--- apps/keymaps/keymap-player.c	(revision 21020)
+++ apps/keymaps/keymap-player.c	(working copy)
@@ -90,10 +90,8 @@
 
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_NONE,            BUTTON_ON,               BUTTON_NONE },
-    { ACTION_BMS_DELETE,      BUTTON_PLAY|BUTTON_ON,   BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_settings_bmark */
+}; /* button_context_bmark */
 
 /*****************************************************************************
  *    Remote control mappings
Index: apps/keymaps/keymap-creativezvm.c
===================================================================
--- apps/keymaps/keymap-creativezvm.c	(revision 21020)
+++ apps/keymaps/keymap-creativezvm.c	(working copy)
@@ -167,7 +167,6 @@
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_BACK, BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-c100.c
===================================================================
--- apps/keymaps/keymap-c100.c	(revision 21020)
+++ apps/keymaps/keymap-c100.c	(working copy)
@@ -264,8 +264,6 @@
 }; /* button_context_keyboard */
 
 static const struct button_mapping button_context_bmark[]  = {
-//    { ACTION_BMS_DELETE,       BUTTON_REC,                       BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-gigabeat.c
===================================================================
--- apps/keymaps/keymap-gigabeat.c	(revision 21020)
+++ apps/keymaps/keymap-gigabeat.c	(working copy)
@@ -203,8 +203,6 @@
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_A, BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-gigabeat-s.c
===================================================================
--- apps/keymaps/keymap-gigabeat-s.c	(revision 21020)
+++ apps/keymaps/keymap-gigabeat-s.c	(working copy)
@@ -214,8 +214,6 @@
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE, BUTTON_BACK|BUTTON_SELECT, BUTTON_BACK },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
@@ -408,8 +406,6 @@
 }; /* remote_button_context_time */
 
 static const struct button_mapping remote_button_context_bmark[]  = {
-    { ACTION_BMS_DELETE, BUTTON_RC_DSP|BUTTON_REPEAT, BUTTON_RC_DSP },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* remote_button_context_bmark */
 
Index: apps/keymaps/keymap-c200.c
===================================================================
--- apps/keymaps/keymap-c200.c	(revision 21020)
+++ apps/keymaps/keymap-c200.c	(working copy)
@@ -276,8 +276,6 @@
 }; /* button_context_keyboard */
 
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_REC,                       BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-recorder.c
===================================================================
--- apps/keymaps/keymap-recorder.c	(revision 21020)
+++ apps/keymaps/keymap-recorder.c	(working copy)
@@ -202,11 +202,8 @@
 
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_NONE,            BUTTON_ON,               BUTTON_NONE },
-    { ACTION_BMS_DELETE,      BUTTON_PLAY|BUTTON_ON,   BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-    
-}; /* button_context_settings_bmark */
+}; /* button_context_bmark */
 
 static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_MENU,        BUTTON_F1,                             BUTTON_NONE },
Index: apps/keymaps/keymap-e200.c
===================================================================
--- apps/keymaps/keymap-e200.c	(revision 21020)
+++ apps/keymaps/keymap-e200.c	(working copy)
@@ -266,8 +266,6 @@
 }; /* button_context_keyboard */
 
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_REC,        BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-sa9200.c
===================================================================
--- apps/keymaps/keymap-sa9200.c	(revision 21020)
+++ apps/keymaps/keymap-sa9200.c	(working copy)
@@ -203,8 +203,6 @@
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,            BUTTON_RIGHT,               BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-m200.c
===================================================================
--- apps/keymaps/keymap-m200.c	(revision 21020)
+++ apps/keymaps/keymap-m200.c	(working copy)
@@ -276,8 +276,6 @@
 }; /* button_context_keyboard */
 
 static const struct button_mapping button_context_bmark[]  = {
-//    { ACTION_BMS_DELETE,       BUTTON_REC,                       BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-clip.c
===================================================================
--- apps/keymaps/keymap-clip.c	(revision 21020)
+++ apps/keymaps/keymap-clip.c	(working copy)
@@ -260,8 +260,6 @@
 }; /* button_context_keyboard */
 
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_HOME,        BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-h10.c
===================================================================
--- apps/keymaps/keymap-h10.c	(revision 21020)
+++ apps/keymaps/keymap-h10.c	(working copy)
@@ -297,7 +297,6 @@
 }; /* button_context_keyboard */
 
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_REW,       BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-av300.c
===================================================================
--- apps/keymaps/keymap-av300.c	(revision 21020)
+++ apps/keymaps/keymap-av300.c	(working copy)
@@ -200,11 +200,8 @@
 
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_NONE,            BUTTON_ON,               BUTTON_NONE },
-    { ACTION_BMS_DELETE,      BUTTON_SELECT|BUTTON_ON, BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-    
-}; /* button_context_settings_bmark */
+}; /* button_context_bmark */
 
 static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_MENU,        BUTTON_F1,                             BUTTON_NONE },
Index: apps/keymaps/keymap-ipod.c
===================================================================
--- apps/keymaps/keymap-ipod.c	(revision 21020)
+++ apps/keymaps/keymap-ipod.c	(working copy)
@@ -118,9 +118,8 @@
 }; /* button_context_settings_yesno */
 
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,          BUTTON_MENU|BUTTON_REPEAT,       BUTTON_MENU },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_settings_bmark */
+}; /* button_context_bmark */
 
 static const struct button_mapping button_context_quickscreen[]  = {
     { ACTION_QS_DOWN,       BUTTON_PLAY,                    BUTTON_NONE },
Index: apps/keymaps/keymap-x5.c
===================================================================
--- apps/keymaps/keymap-x5.c	(revision 21020)
+++ apps/keymaps/keymap-x5.c	(working copy)
@@ -77,10 +77,8 @@
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_REC|BUTTON_REPEAT, BUTTON_REC },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_settings_bmark */
+}; /* button_context_bmark */
 
 /** FM Radio Screen **/
 static const struct button_mapping button_context_radio[]  = {
Index: apps/keymaps/keymap-mr100.c
===================================================================
--- apps/keymaps/keymap-mr100.c	(revision 21020)
+++ apps/keymaps/keymap-mr100.c	(working copy)
@@ -199,8 +199,6 @@
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,        BUTTON_DISPLAY,                 BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-logikdax.c
===================================================================
--- apps/keymaps/keymap-logikdax.c	(revision 21020)
+++ apps/keymaps/keymap-logikdax.c	(working copy)
@@ -258,8 +258,6 @@
 }; /* button_context_keyboard */
 
 static const struct button_mapping button_context_bmark[]  = {
-//    { ACTION_BMS_DELETE,       BUTTON_REC,                       BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-meizu-m6sl.c
===================================================================
--- apps/keymaps/keymap-meizu-m6sl.c	(revision 21020)
+++ apps/keymaps/keymap-meizu-m6sl.c	(working copy)
@@ -190,8 +190,6 @@
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_PLAY, BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-ondio.c
===================================================================
--- apps/keymaps/keymap-ondio.c	(revision 21020)
+++ apps/keymaps/keymap-ondio.c	(working copy)
@@ -115,10 +115,8 @@
 
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_NONE,              BUTTON_LEFT,                 BUTTON_NONE },
-    { ACTION_BMS_DELETE,      BUTTON_LEFT|BUTTON_REPEAT,   BUTTON_LEFT },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_settings_bmark */
+}; /* button_context_bmark */
 
 static const struct button_mapping button_context_pitchscreen[]  = {
     { ACTION_PS_INC_SMALL,      BUTTON_UP,                  BUTTON_NONE },
Index: apps/keymaps/keymap-hdd1630.c
===================================================================
--- apps/keymaps/keymap-hdd1630.c	(revision 21020)
+++ apps/keymaps/keymap-hdd1630.c	(working copy)
@@ -203,8 +203,6 @@
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_VIEW, BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: apps/keymaps/keymap-fuze.c
===================================================================
--- apps/keymaps/keymap-fuze.c	(revision 21020)
+++ apps/keymaps/keymap-fuze.c	(working copy)
@@ -268,8 +268,6 @@
 }; /* button_context_keyboard */
 
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_HOME,        BUTTON_NONE },
-
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
Index: manual/platform/keymap-h100_h300.tex
===================================================================
--- manual/platform/keymap-h100_h300.tex	(revision 21020)
+++ manual/platform/keymap-h100_h300.tex	(working copy)
@@ -104,6 +104,3 @@
 \newcommand{\ActionFMSettingsDec}{\ActionSettingDec}
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
-
-%Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{\ButtonRec}
\ No newline at end of file
Index: manual/platform/keymap-ondio.tex
===================================================================
--- manual/platform/keymap-ondio.tex	(revision 21020)
+++ manual/platform/keymap-ondio.tex	(working copy)
@@ -80,7 +80,3 @@
 \newcommand{\ActionFMSettingsDec}{\ButtonDown}
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
-
-%Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{Long \ButtonLeft}
-
Index: manual/platform/keymap-gigabeatf.tex
===================================================================
--- manual/platform/keymap-gigabeatf.tex	(revision 21020)
+++ manual/platform/keymap-gigabeatf.tex	(working copy)
@@ -82,6 +82,3 @@
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonA}
 \newcommand{\ActionPsExit}{\ButtonPower}
-
-%Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{\ButtonA}
\ No newline at end of file
Index: manual/platform/keymap-mrobe100.tex
===================================================================
--- manual/platform/keymap-mrobe100.tex	(revision 21020)
+++ manual/platform/keymap-mrobe100.tex	(working copy)
@@ -83,6 +83,3 @@
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonDisplay}
 \newcommand{\ActionPsExit}{\ButtonPlay}
-
-%Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{\ButtonDisplay}
Index: manual/platform/keymap-ipod4g.tex
===================================================================
--- manual/platform/keymap-ipod4g.tex	(revision 21020)
+++ manual/platform/keymap-ipod4g.tex	(working copy)
@@ -88,6 +88,3 @@
 \newcommand{\ActionRecSettingsDec}{\ButtonLeft}
 \newcommand{\ActionRecPrev}{\ButtonScrollBack}
 \newcommand{\ActionRecNext}{\ButtonScrollFwd}
-
-%Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{Long \ButtonMenu}
Index: manual/platform/keymap-gigabeats.tex
===================================================================
--- manual/platform/keymap-gigabeats.tex	(revision 21020)
+++ manual/platform/keymap-gigabeats.tex	(working copy)
@@ -113,6 +113,3 @@
 \newcommand{\ActionFMSettingsDec}{\ButtonVolDown}
 \newcommand{\ActionFMPrev}{\ButtonUp}
 \newcommand{\ActionFMNext}{\ButtonNext}
-
-%Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{\ButtonBack{} + \ButtonSelect}
Index: manual/platform/keymap-player.tex
===================================================================
--- manual/platform/keymap-player.tex	(revision 21020)
+++ manual/platform/keymap-player.tex	(working copy)
@@ -44,6 +44,3 @@
 %Button actions, Setting context
 \newcommand{\ActionSettingInc}{\ButtonRight}
 \newcommand{\ActionSettingDec}{\ButtonLeft}
-
-%Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{\ButtonOn{} + \ButtonPlay}
Index: manual/platform/keymap-c200.tex
===================================================================
--- manual/platform/keymap-c200.tex	(revision 21020)
+++ manual/platform/keymap-c200.tex	(working copy)
@@ -107,7 +107,3 @@
 \newcommand{\ActionFMSettingsDec}{\ButtonVolDown}
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
-
-%Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{\ButtonRec}
-
Index: manual/platform/keymap-recorder.tex
===================================================================
--- manual/platform/keymap-recorder.tex	(revision 21020)
+++ manual/platform/keymap-recorder.tex	(working copy)
@@ -108,5 +108,3 @@
 \newcommand{\ActionFMSettingsDec}{\ButtonDown}
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
-
-\newcommand{\ActionBmDelete}{\ButtonOn{} + \ButtonPlay}
\ No newline at end of file
Index: manual/platform/keymap-e200.tex
===================================================================
--- manual/platform/keymap-e200.tex	(revision 21020)
+++ manual/platform/keymap-e200.tex	(working copy)
@@ -105,7 +105,3 @@
 \newcommand{\ActionFMSettingsDec}{\ButtonDown}
 \newcommand{\ActionFMPrev}{\ActionRecSettingsInc}
 \newcommand{\ActionFMNext}{\ActionRecSettingsDec}
-
-%Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{\ButtonRec}
-
Index: manual/platform/keymap-mx5.tex
===================================================================
--- manual/platform/keymap-mx5.tex	(revision 21020)
+++ manual/platform/keymap-mx5.tex	(working copy)
@@ -90,7 +90,3 @@
 \newcommand{\ActionFMSettingsDec}{\ActionSettingDec}
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
-
-%Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{Long \ButtonRec}
-
Index: manual/platform/keymap-ipod3g.tex
===================================================================
--- manual/platform/keymap-ipod3g.tex	(revision 21020)
+++ manual/platform/keymap-ipod3g.tex	(working copy)
@@ -77,6 +77,3 @@
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonMenu}
 \newcommand{\ActionPsExit}{\ButtonSelect}
-
-%Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{Long \ButtonMenu}
Index: manual/platform/keymap-h10.tex
===================================================================
--- manual/platform/keymap-h10.tex	(revision 21020)
+++ manual/platform/keymap-h10.tex	(working copy)
@@ -107,7 +107,3 @@
 \newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
 \newcommand{\ActionRecPrev}{\ButtonRew}
 \newcommand{\ActionRecNext}{\ButtonFF}
-
-%Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{Long \ButtonRew}
-
Index: manual/configure_rockbox/bookmarking.tex
===================================================================
--- manual/configure_rockbox/bookmarking.tex	(revision 21020)
+++ manual/configure_rockbox/bookmarking.tex	(working copy)
@@ -61,28 +61,8 @@
   
   \item [Bookmark list keys.]  The following keys can be used to navigate in
   any bookmark list.\\
-\begin{table}
-    \begin{btnmap}{}{}
-      \ActionStdNext
-      & Selects the next bookmark.\\
-      %
-      \ActionStdPrev
-      & Selects the previous bookmark.\\
-      %
-      \ActionStdOk
-      & Resumes from the selected bookmark.\\
-      %
-      \ActionStdCancel
-      & Exits Recent Bookmark menu\\
-      %
-      \nopt{GIGABEAT_S_PAD}{\ActionBmDelete
-      & Deletes the currently selected bookmark\\}
-      %
-      \ActionStdContext  
-      & Enters the context menu for the selected bookmark.\\
-    \end{btnmap}
-\end{table}
 
+
 There are two options in the context menu:\\*
   
   \setting{Resume} will commence playback of the currently selected bookmark entry.