diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index c4e013afdc..3ae4893290 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -308,9 +308,6 @@ void button_init(void)
 #ifdef TARGET_TREE
     button_init_device();
     
-#elif CONFIG_KEYPAD == IRIVER_H100_PAD \
-      ||  CONFIG_KEYPAD == IRIVER_H300_PAD
-    button_init_device(); /* temp untill TARGET_TREE is defined */
 #elif CONFIG_KEYPAD == RECORDER_PAD
     /* Set PB4 and PB8 as input pins */
     PBCR1 &= 0xfffc;  /* PB8MD = 00 */
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 18da59e13a..baba07fc1f 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -72,10 +72,7 @@ void wheel_send_events(bool send);
 #else
 
   /* Target specific button codes */
-#if (CONFIG_KEYPAD == IRIVER_H100_PAD) \
-    || (CONFIG_KEYPAD == IRIVER_H300_PAD)
-#include "button-target.h"
-#elif CONFIG_KEYPAD == RECORDER_PAD
+#if CONFIG_KEYPAD == RECORDER_PAD
 
  /* Recorder specific button codes */
 
@@ -113,32 +110,6 @@ void wheel_send_events(bool send);
 
 #elif CONFIG_KEYPAD == PLAYER_PAD
 
-/* Jukebox 6000 and Studio specific button codes */
-
-        /* Main unit's buttons */
-#define BUTTON_ON           0x00000001
-#define BUTTON_STOP         0x00000002
-
-#define BUTTON_LEFT         0x00000004
-#define BUTTON_RIGHT        0x00000008
-#define BUTTON_PLAY         0x00000010
-#define BUTTON_MENU         0x00000020
-
-#define BUTTON_MAIN (BUTTON_ON|BUTTON_STOP|BUTTON_LEFT|BUTTON_RIGHT\
-                |BUTTON_PLAY|BUTTON_MENU)
-
-    /* Remote control's buttons */
-#define BUTTON_RC_PLAY      0x00100000
-#define BUTTON_RC_STOP      0x00080000
-
-#define BUTTON_RC_LEFT      0x00040000
-#define BUTTON_RC_RIGHT     0x00020000
-#define BUTTON_RC_VOL_UP    0x00010000
-#define BUTTON_RC_VOL_DOWN  0x00008000
-
-#define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\
-                |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\
-                |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN)
 
 
 #elif CONFIG_KEYPAD == ONDIO_PAD