4 files changed, 4 insertions, 8 deletions

diff --git a/apps/features.txt b/apps/features.txt
index a80408de8b..f5ebe9834c 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -146,9 +146,9 @@ tagcache
 tc_ramcache
 #endif
 
-#if CONFIG_CHARGING || defined(SIMULATOR)
+#if CONFIG_CHARGING
 charging
-#if defined(HAVE_USB_POWER) || defined(SIMULATOR)
+#if defined(HAVE_USB_POWER)
 usb_charging
 #endif
 #endif
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index b1ba6680be..283acc4cb7 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -122,7 +122,6 @@ MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu,
 /*    SYSTEM MENU                  */
 
 /* Battery */
-#ifndef SIMULATOR
 #if BATTERY_CAPACITY_INC > 0
 MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL);
 #endif
@@ -158,7 +157,6 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON,
 #endif
 #endif
          );
-#endif /* SIMULATOR */
 /* Disk */
 #ifndef HAVE_FLASH_STORAGE
 MENUITEM_SETTING(disk_spindown, &global_settings.disk_spindown, NULL);
@@ -340,7 +338,7 @@ MENUITEM_SETTING(buttonlight_brightness, &global_settings.buttonlight_brightness
 MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), 
           0, Icon_System_menu,
             &start_screen,
-#ifndef SIMULATOR
+#if (BATTERY_CAPACITY_INC > 0) || (BATTERY_TYPES_COUNT > 1)
             &battery_menu,
 #endif
 #if defined(HAVE_DIRCACHE) || !defined(HAVE_FLASH_STORAGE)
diff --git a/apps/screens.c b/apps/screens.c
index 5dbca7a59c..700164f10e 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -779,7 +779,7 @@ bool quick_screen_f3(int button_enter)
 #endif /* BUTTON_F3 */
 #endif /* CONFIG_KEYPAD in (RECORDER_PAD |IRIVER_H100_PAD | IRIVER_H300_PAD) */
 
-#if CONFIG_CHARGING || defined(SIMULATOR)
+#if CONFIG_CHARGING
 void charging_splash(void)
 {
     gui_syncsplash(2*HZ, (unsigned char *)str(LANG_BATTERY_CHARGE));
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 70d521b4a9..1b8b33363d 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -499,14 +499,12 @@ const struct settings_list settings[] = {
         200,
 #endif
             "max files in dir", UNIT_INT,50,10000,50,NULL,NULL,NULL),
-#ifndef SIMULATOR
 #if BATTERY_CAPACITY_INC > 0
     INT_SETTING(0, battery_capacity, LANG_BATTERY_CAPACITY, BATTERY_CAPACITY_DEFAULT, 
                 "battery capacity", UNIT_MAH,
                 BATTERY_CAPACITY_MIN, BATTERY_CAPACITY_MAX, BATTERY_CAPACITY_INC,
                 NULL, NULL, NULL),
 #endif
-#endif
 #if CONFIG_CHARGING
     OFFON_SETTING(NVRAM(1), car_adapter_mode,
         LANG_CAR_ADAPTER_MODE, false, "car adapter mode", NULL),