diff --git a/firmware/settings.c b/firmware/settings.c
deleted file mode 100644
index 6d22419dfe..0000000000
--- a/firmware/settings.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2002 by wavey@wavey.org
- *
- * All files in this archive are subject to the GNU General Public License.
- * See the file COPYING in the source tree root for full license agreement.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#include <stdio.h>
-#include "config.h"
-#include "settings.h"
-#include "disk.h"
-#include "panic.h"
-#include "debug.h"
-
-user_settings_t global_settings;
-
-/*
- * persist all runtime user settings to disk
- */
-int persist_all_settings( void )
-{
-    return 1;
-}
-
-/*
- * persist all the playlist information to disk
- */
-int persist_all_playlist_info( void )
-{
-    return 1;
-}
-
-/*
- * load settings from disk
- */
-void reload_all_settings( user_settings_t *settings )
-{
-    DEBUGF( "reload_all_settings()\n" );
-
-    /* this is a TEMP stub version */
-    
-    /* populate settings with default values */
-    
-    reset_settings( settings );
-}
-
-/*
- * reset all settings to their default value 
- */
-void reset_settings( user_settings_t *settings ) {
-        
-    DEBUGF( "reset_settings()\n" );
-
-    settings->volume      = DEFAULT_VOLUME_SETTING;
-    settings->balance     = DEFAULT_BALANCE_SETTING;
-    settings->bass        = DEFAULT_BASS_SETTING;
-    settings->treble      = DEFAULT_TREBLE_SETTING;
-    settings->loudness    = DEFAULT_LOUDNESS_SETTING;
-    settings->bass_boost  = DEFAULT_BASS_BOOST_SETTING;
-    settings->contrast    = DEFAULT_CONTRAST_SETTING;
-    settings->poweroff    = DEFAULT_POWEROFF_SETTING;
-    settings->backlight   = DEFAULT_BACKLIGHT_SETTING;
-    settings->wps_display = DEFAULT_WPS_DISPLAY;
-}
-
-
-/*
- * dump the list of current settings
- */
-void display_current_settings( user_settings_t *settings )
-{
-#ifdef DEBUG
-    DEBUGF( "\ndisplay_current_settings()\n" );
-
-    DEBUGF( "\nvolume:\t\t%d\nbalance:\t%d\nbass:\t\t%d\ntreble:\t\t%d\nloudness:\t%d\nbass boost:\t%d\n",
-            settings->volume,
-            settings->balance,
-            settings->bass,
-            settings->treble,
-            settings->loudness,
-            settings->bass_boost );
-
-    DEBUGF( "contrast:\t%d\npoweroff:\t%d\nbacklight:\t%d\n",
-            settings->contrast,
-            settings->poweroff,
-            settings->backlight );
-#else
-    /* Get rid of warning */
-    settings = settings;
-#endif
-}
diff --git a/firmware/settings.h b/firmware/settings.h
deleted file mode 100644
index 723c694699..0000000000
--- a/firmware/settings.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2002 by wavey@wavey.org
- *
- * All files in this archive are subject to the GNU General Public License.
- * See the file COPYING in the source tree root for full license agreement.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#ifndef __SETTINGS_H__
-#define __SETTINGS_H__
-
-/* data structures */
-
-typedef enum 
-{
-    RESUME_NONE,       /* do not resume              */
-    RESUME_SONG,       /* resume song at startup     */
-    RESUME_PLAYLIST    /* resume playlist at startup */
-} resume_t;
-
-typedef struct
-{
-    /* audio settings */
-
-    int volume;     /* audio output volume:  0-100 0=off   100=max           */
-    int balance;    /* stereo balance:       0-100 0=left  50=bal 100=right  */
-    int bass;       /* bass eq:              0-100 0=off   100=max           */
-    int treble;     /* treble eq:            0-100 0=low   100=high          */
-    int loudness;   /* loudness eq:          0-100 0=off   100=max           */
-    int bass_boost; /* bass boost eq:        0-100 0=off   100=max           */
-
-    /* device settings */
-
-    int contrast;   /* lcd contrast:         0-100 0=low 100=high            */
-    int poweroff;   /* power off timer:      0-100 0=never:each 1% = 60 secs */ 
-    int backlight;  /* backlight off timer:  0-100 0=never:each 1% = 10 secs */
-
-    /* resume settings */
-
-    resume_t resume;   /* power-on song resume: 0=no. 1=yes song. 2=yes pl   */
-    int track_time;    /* number of seconds into the track to resume         */
-
-    /* misc options */
-
-    int loop_playlist; /* do we return to top of playlist at end?            */
-
-
-    /* while playing screen settings  */
-    int wps_display;
-
-} user_settings_t;
-
-/* prototypes */
-
-int persist_all_settings( void );
-void reload_all_settings( user_settings_t *settings );
-void reset_settings( user_settings_t *settings );
-void display_current_settings( user_settings_t *settings );
-
-/* global settings */
-extern user_settings_t global_settings;
-
-/* system defines */
-
-#define DEFAULT_VOLUME_SETTING     70
-#define DEFAULT_BALANCE_SETTING    50
-#define DEFAULT_BASS_SETTING       50
-#define DEFAULT_TREBLE_SETTING     50
-#define DEFAULT_LOUDNESS_SETTING    0
-#define DEFAULT_BASS_BOOST_SETTING  0
-#define DEFAULT_CONTRAST_SETTING    0
-#define DEFAULT_POWEROFF_SETTING    0
-#define DEFAULT_BACKLIGHT_SETTING   5
-#define DEFAULT_WPS_DISPLAY         0 
-
-#endif /* __SETTINGS_H__ */