27 files changed, 148 insertions, 179 deletions

diff --git a/apps/lang/afrikaans.lang b/apps/lang/afrikaans.lang
index 49a1084158..48f7fb4f2e 100644
--- a/apps/lang/afrikaans.lang
+++ b/apps/lang/afrikaans.lang
@@ -231,9 +231,9 @@ eng: "Scroll Speed Setting Example"
 new: "Rol Spoed Opsie Voorbeeld 12345"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-new: "Diepontlaai"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index 14c5802400..412183b0f2 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -228,9 +228,9 @@ eng: "Scroll Speed Setting Example"
 new: "Ñêðîëèðàíå Ñêîðîñò Íàñòðîéêè Ïðèìåð"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-new: "Iieiay ?ac?yaea"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1188,9 +1188,9 @@ eng: "Scroll Step Size Setting Example Text"
 new:  "Ïðèìåð"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-new: "Ðåãóëèðàíî çàðåæäàíå"
+desc: LANG_TRICKLE_CHARGE
+eng: ""
+new: ""
 
 id: LANG_STATUS_BAR
 desc: display menu, F3 substitute
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index 2c6d094ba5..95bd7130c4 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -183,10 +183,10 @@ voice: ""
 new: "Ukázka rychlosti rolování"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-voice: "Deep Discharge"
-new: "Úplné vybití"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1059,10 +1059,10 @@ voice: "Scroll Speed"
 new: "Rychlost rolování"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-voice: "Trickle Charge"
-new: "Pøeru¹ované nabíjení"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_BATTERY_TOPOFF_CHARGE
 desc: in info display, shows that top off charge is running
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index 69da29dbd2..301e09107b 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -187,10 +187,10 @@ voice: ""
 new: "Eksempel på rulle-hastighed"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-voice: "Deep Discharge"
-new: "Dyb afladning"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1075,10 +1075,10 @@ voice: "Scroll Speed"
 new: "Rulle hastighed"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-voice: "Trickle Charge"
-new: "Dryp-ladning"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_BATTERY_TOPOFF_CHARGE
 desc: in info display, shows that top off charge is running
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 7b771448e1..482e218f9d 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -181,10 +181,10 @@ voice: ""
 new: "Beispieltext für die Scrollgeschwindigkeit"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-voice: "Vollständiges Entladen"
-new: "Vollständiges Entladen"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1057,10 +1057,10 @@ voice: "Geschwindigkeit"
 new: "Geschwindigkeit"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-voice: "Erhaltladen"
-new: "Erhaltladen"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_BATTERY_TOPOFF_CHARGE
 desc: in info display, shows that top off charge is running
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 45ded9d752..a9f3dac6e4 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -194,9 +194,9 @@ voice: ""
 new:
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-voice: "Deep Discharge"
+desc: DEPRECATED
+eng: ""
+voice: ""
 new:
 
 id: LANG_TIME
@@ -1070,9 +1070,9 @@ voice: "Scroll Speed"
 new:
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-voice: "Trickle Charge"
+desc: DEPRECATED
+eng: ""
+voice: ""
 new:
 
 id: LANG_BATTERY_TOPOFF_CHARGE
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 04728ed4f3..190fd15caf 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -180,10 +180,10 @@ voice: ""
 new: "Ejemplo de la velocidad de desplazamiento"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-voice: "Descarga Completa"
-new: "Descarga Completa"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1170,10 +1170,10 @@ voice: "Formato del reloj"
 new: "Formato del reloj" 
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-voice: "Carga de mantenimiento"
-new: "Carga de mantenimiento"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_VOLUME_DISPLAY
 desc: Volume type title
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 89e1e21edb..de01aa99b6 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -192,10 +192,10 @@ voice: ""
 new: "Exemple de vitesse de défilement"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-voice: "Décharge complète"
-new: "Décharge complète"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1068,10 +1068,10 @@ voice: "Vitesse de défilement"
 new: "Vitesse de défilement"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-voice: "Charge max persistante"
-new: "Charge max persistante"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_BATTERY_TOPOFF_CHARGE
 desc: in info display, shows that top off charge is running
diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang
index 4b40419241..0dbef3c975 100644
--- a/apps/lang/galego.lang
+++ b/apps/lang/galego.lang
@@ -230,9 +230,9 @@ eng: "Scroll Speed Setting Example"
 new: "Exemplo da velocidade de desprazamento"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-new: "Descarga profunda"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1308,9 +1308,9 @@ eng: "Time Format"
 new: "Formato do reloxo"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-new: "Carga Trickle"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_VOLUME_DISPLAY
 desc: Volume type title
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index ee03fb7a2e..076fd40238 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -232,9 +232,9 @@ eng: "Scroll Speed Setting Example"
 new: "ÐáñÜäåéãìá Ôá÷ýôçôáò Êýëéóçò"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-new: "ÔÝëåéá Áðïöüñôçóç"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1202,8 +1202,8 @@ eng: "Scroll Step Size Setting Example Text"
 new: 
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
+desc: DEPRECATED
+eng: ""
 ### Not previously translated
 new: 
 
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 0edaf5bb97..d6dfb4eced 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -245,9 +245,9 @@ eng: "Scroll Speed Setting Example"
 new: "ãåâîä ìîäéøåú äçì÷ä"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-new: "ôéøå÷ äñåììä"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
diff --git a/apps/lang/islenska.lang b/apps/lang/islenska.lang
index 24d2523b0a..c819daa269 100644
--- a/apps/lang/islenska.lang
+++ b/apps/lang/islenska.lang
@@ -234,9 +234,9 @@ eng: "Scroll Speed Setting Example"
 new: "Skrunuhraði stillingar dæmi"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-new: "Full afhlöðun"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1196,9 +1196,9 @@ eng: "Scroll Speed"
 new: "Skrunahraði"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-new: "Stöðug hlöðun"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_BATTERY_TOPOFF_CHARGE
 desc: in info display, shows that top off charge is running
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 14c259cb64..7741af8920 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -232,9 +232,9 @@ eng: "Scroll Speed Setting Example"
 new: "Esempio Impostazione Velocità Scorrimento"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-new: "Scarica Completa"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1196,9 +1196,9 @@ eng: "Scroll Speed"
 new: "Velocità Scorrimento"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-new: "Carica Passo-Passo"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_BATTERY_TOPOFF_CHARGE
 desc: in info display, shows that top off charge is running
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index b6500bb898..12e46a4fdf 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -151,9 +151,9 @@ eng: "Scroll Speed Setting Example"
 new: "Scrollsnelheid voorbeeld"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-new: "Diepe Ontlading"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -896,9 +896,9 @@ eng: "Battery: Trickle Chg"
 new: "Batterij: Druppel Laden"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-new: "Druppel Laden" 
+desc: DEPRECATED
+eng: ""
+new: "" 
 
 id: LANG_DELETE
 desc: The verb/action Delete
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index e9025d5942..b23fc58fc1 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -181,10 +181,10 @@ voice: ""
 new: "Eksempel for rullehastighetsinnstilling"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-voice: "Deep Discharge"
-new: "Total utlading"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1075,10 +1075,10 @@ voice: ""
 new: "Eksempel for å sette rullesteglengde"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-voice: "Trickle Charge"
-new: "Topplading"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_MENU_SETTING_CANCEL
 desc: Visual confirmation of canceling a changed setting
diff --git a/apps/lang/polski-ascii.lang b/apps/lang/polski-ascii.lang
index a43d8313a6..68368c7d04 100644
--- a/apps/lang/polski-ascii.lang
+++ b/apps/lang/polski-ascii.lang
@@ -235,9 +235,9 @@ eng: "Scroll Speed Setting Example"
 new: "Przykladowa predkosc przesuwu"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-new: "Rozladowanie"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1201,9 +1201,9 @@ eng: "Scroll Speed"
 new: "Predkosc przesuwania"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-new: "Wolne ladowanie"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_BATTERY_TOPOFF_CHARGE
 desc: in info display, shows that top off charge is running
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index dcb1c4bf45..ff4cbde674 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -236,9 +236,9 @@ eng: "Scroll Speed Setting Example"
 new: "Przyk³adowa prêdko¶æ przesuwu"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-new: "Roz³adowanie"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1202,9 +1202,9 @@ eng: "Scroll Speed"
 new: "Prêdko¶æ przesuwania"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-new: "Wolne ³adowanie"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_BATTERY_TOPOFF_CHARGE
 desc: in info display, shows that top off charge is running
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 9b1fa15a94..99c4097d3d 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -236,9 +236,9 @@ eng: "Scroll Speed Setting Example"
 new: "Exemplo de conf. da Veloc. de desloc. do ecran"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-new: "Descarga completa"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index 5615ce984a..8e7cecc893 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -224,9 +224,9 @@ eng: "Scroll Speed Setting Example"
 new: "Exemplu de viteza de defilare"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-new: "Descarcare completa"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1189,9 +1189,9 @@ eng: "Scroll Step Size Setting Example Text"
 new: "Exemplu de defilare pentru testarea pasilor"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-new: "Incarcare max persistenta"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_QUEUE_FULL
 desc: queue buffer full
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index 1df61c0bad..f676d6e1ca 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -175,10 +175,10 @@ voice: ""
 new: "Ïðèìåð ñêîðîñòè ïðîêðóòêè"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-voice: "Deep Discharge"
-new: "Ãëóáîêàÿ ðàçðÿäêà"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1069,10 +1069,10 @@ voice: ""
 new: "Îáðàçåö òåêñòà äëÿ øàãà ïðîêðóòêè"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-voice: "Trickle Charge"
-new: "Ïåðåçàðÿäêà èìïóëüñàìè"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_STATUS_BAR
 desc: display menu, F3 substitute
diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang
index 2b84b64637..efe674e441 100644
--- a/apps/lang/slovenscina.lang
+++ b/apps/lang/slovenscina.lang
@@ -244,9 +244,9 @@ eng: "Scroll Speed Setting Example"
 new: "Preizkus hitrosti premikanja"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-new: "Izprazni"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1210,9 +1210,9 @@ eng: "Scroll Speed"
 new: "Hitrost premikanja"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-new: "Trajno polnenje"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_BATTERY_TOPOFF_CHARGE
 desc: in info display, shows that top off charge is running
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index dafaf334ac..86b90a7dad 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -180,10 +180,10 @@ voice: ""
 new: "Exempel på rullningshastighet"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep Discharge"
-voice: "Deep Discharge"
-new: "Total urladdning"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -1074,10 +1074,10 @@ voice: ""
 new: "Exempel för att sätta rullningsstegning"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-voice: "Trickle Charge"
-new: "Underhållsladdning"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new: ""
 
 id: LANG_MENU_SETTING_CANCEL
 desc: Visual confirmation of canceling a changed setting
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index 9185607ca4..dfe0438a73 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -229,9 +229,9 @@ eng: "Scroll Speed Setting Example"
 new: "Kayma Hizi Ayari Ornegi"
  
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep discharge"
-new: "Tam desarj"
+desc: DEPRECATED
+eng: ""
+new: ""
  
 id: LANG_TIME
 desc: in settings_menu
diff --git a/apps/lang/wallisertitsch.lang b/apps/lang/wallisertitsch.lang
index bc3badb50a..bd7045450b 100644
--- a/apps/lang/wallisertitsch.lang
+++ b/apps/lang/wallisertitsch.lang
@@ -151,9 +151,9 @@ eng: "Scroll Speed Setting Example"
 new: "Biispiltext fer dScrollgschwindigkeit"
 
 id: LANG_DISCHARGE
-desc: in settings_menu
-eng: "Deep discharge"
-new: "Vollständigs Entladu"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_TIME
 desc: in settings_menu
@@ -881,9 +881,9 @@ eng: "Scroll Speed"
 new: "Scroll-Gschwindigkeit"
 
 id: LANG_TRICKLE_CHARGE
-desc: in settings_menu
-eng: "Trickle Charge"
-new: "Erhaltladu"
+desc: DEPRECATED
+eng: ""
+new: ""
 
 id: LANG_BATTERY_TOPOFF_CHARGE
 desc: in info display, shows that top off charge is running
diff --git a/apps/settings.c b/apps/settings.c
index 866f87879e..8ff9c7b0b0 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -72,7 +72,7 @@ const char rec_base_directory[] = REC_BASE_DIR;
 
 
 
-#define CONFIG_BLOCK_VERSION 19
+#define CONFIG_BLOCK_VERSION 20
 #define CONFIG_BLOCK_SIZE 512
 #define RTC_BLOCK_SIZE 44
 
@@ -217,10 +217,6 @@ static const struct bit_entry rtc_bits[] =
     {14, S_O(max_files_in_dir), 400, 
         "max files in dir", NULL }, /* 50...10000 */
     /* battery */
-#ifdef HAVE_CHARGE_CTRL
-    {1, S_O(discharge), 0, "deep discharge", off_on },
-    {1, S_O(trickle_charge), true, "trickle charge", off_on },
-#endif
     {12, S_O(battery_capacity), BATTERY_CAPACITY_MIN, "battery capacity",
          NULL }, /* 1500...3200 for NiMH, 2200...3200 for LiIon,
                      500...1500 for Alkaline */
@@ -762,10 +758,6 @@ void settings_apply(void)
 #endif
 
     set_poweroff_timeout(global_settings.poweroff);
-#ifdef HAVE_CHARGE_CTRL
-    enable_deep_discharge(global_settings.discharge);
-    enable_trickle_charge(global_settings.trickle_charge);
-#endif
 
     set_battery_capacity(global_settings.battery_capacity);
 #if BATTERY_TYPES_COUNT > 1
diff --git a/apps/settings.h b/apps/settings.h
index c6e4a56fc8..d738261c62 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -183,8 +183,6 @@ struct user_settings
                                1=always,
                                then according to timeout_values[] */
     bool backlight_on_when_charging;
-    bool discharge; /* maintain charge of at least: false = 85%, true = 10%  */
-    bool trickle_charge; /* do trickle charging: 0=off, 1=on */
     int battery_capacity; /* in mAh */
     int battery_type;  /* for units which can take multiple types (Ondio). */
 
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 4d164180dc..bc87ec141d 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -722,23 +722,6 @@ static bool battery_type(void)
 #endif
 #endif
 
-#ifdef HAVE_CHARGE_CTRL
-static bool deep_discharge(void)
-{
-    bool result;
-    result = set_bool( str(LANG_DISCHARGE), &global_settings.discharge );
-    enable_deep_discharge(global_settings.discharge);
-    return result;
-}
-static bool trickle_charge(void)
-{
-    bool result;
-    result = set_bool( str(LANG_TRICKLE_CHARGE), &global_settings.trickle_charge );
-    enable_trickle_charge(global_settings.trickle_charge);
-    return result;
-}
-#endif
-
 #ifdef HAVE_RTC
 static bool timedate_set(void)
 {
@@ -1256,10 +1239,6 @@ static bool battery_settings_menu(void)
     bool result;
 
     static const struct menu_item items[] = {
-#ifdef HAVE_CHARGE_CTRL
-        { ID2P(LANG_DISCHARGE),        deep_discharge   },
-        { ID2P(LANG_TRICKLE_CHARGE),   trickle_charge   },
-#endif
 #ifndef SIMULATOR
         { ID2P(LANG_BATTERY_CAPACITY), battery_capacity },
 #if BATTERY_TYPES_COUNT > 1