diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index b7278678f..8d243e510 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -358,7 +358,6 @@ extra.latitude Breitengrad
 extra.loadconfig Neutrino-Einstellungen: Laden von
 extra.loadkeys Lade Tastenbelegung von
 extra.lodirection Längengrad-Ausrichtung
-extra.logo Logonummer
 extra.longitude Längengrad
 extra.menu_left_exit "links" = Menü zurück
 extra.north Norden
@@ -369,8 +368,6 @@ extra.rounded_corners_off eckig
 extra.rounded_corners_on abgerundet
 extra.saveconfig Neutrino-Einstellungen: Sichern als
 extra.savekeys Speichere Tastenbelegung als
-extra.scan_fast Schnell
-extra.scan_full Total
 extra.scrambled_message Verschlüsselung melden
 extra.show_mute_icon Mute-Icon bei Lautstärke 0
 extra.sms_channel SMS-Modus Kanal
@@ -400,11 +397,9 @@ extra.zap_cycle Zap nur in Bouquet
 extra.zapit_fe_timeout Tuning Timeout (1=10ms)
 extra.zapit_hvoltage High (13.5/ 18.5) Voltage
 extra.zapit_make_bouquet Kanalliste auffüllen
-extra.zapit_menu Zapit-Einstellungen
 extra.zapit_motor_speed Rotor Drehzeit (10 = 1°/ sec)
 extra.zapit_scanpids PIDs scannen/nutzen
 extra.zapit_sdt_changed Kanalliste wird neu geladen.
-extra.zapit_write_names Schreibe Kanalname
 fan_speed CPU-Lüftergeschwindigkeit
 favorites.addchannel Der aktuelle Kanal wird dem Bouquet \n"Meine Favoriten" hinzugefügt. \nDie Speicherung benötigt einen Moment...
 favorites.bouquetname Meine Favoriten
@@ -1023,7 +1018,6 @@ personalize.button_red Rot
 personalize.button_yellow Gelb
 personalize.disabled deaktiviert
 personalize.enabled aktiviert
-personalize.features Erweiterungen
 personalize.head Menüs anpassen
 personalize.help Hilfe
 personalize.help_line1 Die Personalisierung ermöglicht es, die wichtigsten
@@ -1045,7 +1039,6 @@ personalize.pinhint Personalisierungs PIN Code eingeben
 personalize.pinprotect ja
 personalize.pinstatus mit PIN
 personalize.plugins Plugins
-personalize.setupmenuwithpin Einstellungen-Menü mit PIN
 personalize.usermenu_preferred_buttons Bevorzugte Tasten zuweisen
 personalize.usermenu_show_cancel Zeige Schalter "Abbrechen" 
 personalize.visible sichtbar
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 89999174d..1ea978765 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -358,7 +358,6 @@ extra.latitude Latitude
 extra.loadconfig Neutrino-Settings: Load from
 extra.loadkeys Load keys from
 extra.lodirection LoDirection
-extra.logo Logo number
 extra.longitude Longitude
 extra.menu_left_exit "Left" = menu back
 extra.north North
@@ -369,8 +368,6 @@ extra.rounded_corners_off angular
 extra.rounded_corners_on rounded
 extra.saveconfig Neutrino-Settings: Save as
 extra.savekeys Save keys as
-extra.scan_fast Fast
-extra.scan_full Full
 extra.scrambled_message Scrambled Message
 extra.show_mute_icon mute-icon at volume 0
 extra.sms_channel sms-mode channel
@@ -400,11 +397,9 @@ extra.zap_cycle Zap cycle
 extra.zapit_fe_timeout Tune timeout (1 = 10 msec)
 extra.zapit_hvoltage 18V for rotor moving 
 extra.zapit_make_bouquet Make Remaining Channels list
-extra.zapit_menu Zapit options
 extra.zapit_motor_speed Motor moving speed (10 = 1deg/sec)
 extra.zapit_scanpids Scan/Use pids
 extra.zapit_sdt_changed Channels changed, reload settings.
-extra.zapit_write_names Write channel names
 fan_speed CPU Fan speed
 favorites.addchannel The current channel will be added \nto the bouquet "My Favorites". \n This will take a few seconds...
 favorites.bouquetname My Favorites
@@ -1023,7 +1018,6 @@ personalize.button_red red
 personalize.button_yellow yellow
 personalize.disabled Disabled
 personalize.enabled Enabled
-personalize.features Features menue
 personalize.head Personalization
 personalize.help Help
 personalize.help_line1 Personalization makes it possible to adapt the most
@@ -1045,7 +1039,6 @@ personalize.pinhint Enter the Personalization PIN Code
 personalize.pinprotect Yes
 personalize.pinstatus Require PIN
 personalize.plugins Plugins
-personalize.setupmenuwithpin Settings Menu with PIN
 personalize.usermenu_preferred_buttons Assigning of preferred keys
 personalize.usermenu_show_cancel Show "Cancel"-Button
 personalize.visible Visible
diff --git a/src/system/locals.h b/src/system/locals.h
index 525ecb2de..37ee12fce 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -385,7 +385,6 @@ typedef enum
 	LOCALE_EXTRA_LOADCONFIG,
 	LOCALE_EXTRA_LOADKEYS,
 	LOCALE_EXTRA_LODIRECTION,
-	LOCALE_EXTRA_LOGO,
 	LOCALE_EXTRA_LONGITUDE,
 	LOCALE_EXTRA_MENU_LEFT_EXIT,
 	LOCALE_EXTRA_NORTH,
@@ -396,8 +395,6 @@ typedef enum
 	LOCALE_EXTRA_ROUNDED_CORNERS_ON,
 	LOCALE_EXTRA_SAVECONFIG,
 	LOCALE_EXTRA_SAVEKEYS,
-	LOCALE_EXTRA_SCAN_FAST,
-	LOCALE_EXTRA_SCAN_FULL,
 	LOCALE_EXTRA_SCRAMBLED_MESSAGE,
 	LOCALE_EXTRA_SHOW_MUTE_ICON,
 	LOCALE_EXTRA_SMS_CHANNEL,
@@ -427,11 +424,9 @@ typedef enum
 	LOCALE_EXTRA_ZAPIT_FE_TIMEOUT,
 	LOCALE_EXTRA_ZAPIT_HVOLTAGE,
 	LOCALE_EXTRA_ZAPIT_MAKE_BOUQUET,
-	LOCALE_EXTRA_ZAPIT_MENU,
 	LOCALE_EXTRA_ZAPIT_MOTOR_SPEED,
 	LOCALE_EXTRA_ZAPIT_SCANPIDS,
 	LOCALE_EXTRA_ZAPIT_SDT_CHANGED,
-	LOCALE_EXTRA_ZAPIT_WRITE_NAMES,
 	LOCALE_FAN_SPEED,
 	LOCALE_FAVORITES_ADDCHANNEL,
 	LOCALE_FAVORITES_BOUQUETNAME,
@@ -1050,7 +1045,6 @@ typedef enum
 	LOCALE_PERSONALIZE_BUTTON_YELLOW,
 	LOCALE_PERSONALIZE_DISABLED,
 	LOCALE_PERSONALIZE_ENABLED,
-	LOCALE_PERSONALIZE_FEATURES,
 	LOCALE_PERSONALIZE_HEAD,
 	LOCALE_PERSONALIZE_HELP,
 	LOCALE_PERSONALIZE_HELP_LINE1,
@@ -1072,7 +1066,6 @@ typedef enum
 	LOCALE_PERSONALIZE_PINPROTECT,
 	LOCALE_PERSONALIZE_PINSTATUS,
 	LOCALE_PERSONALIZE_PLUGINS,
-	LOCALE_PERSONALIZE_SETUPMENUWITHPIN,
 	LOCALE_PERSONALIZE_USERMENU_PREFERRED_BUTTONS,
 	LOCALE_PERSONALIZE_USERMENU_SHOW_CANCEL,
 	LOCALE_PERSONALIZE_VISIBLE,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 5feec2f7c..c36a3a9d9 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -385,7 +385,6 @@ const char * locale_real_names[] =
 	"extra.loadconfig",
 	"extra.loadkeys",
 	"extra.lodirection",
-	"extra.logo",
 	"extra.longitude",
 	"extra.menu_left_exit",
 	"extra.north",
@@ -396,8 +395,6 @@ const char * locale_real_names[] =
 	"extra.rounded_corners_on",
 	"extra.saveconfig",
 	"extra.savekeys",
-	"extra.scan_fast",
-	"extra.scan_full",
 	"extra.scrambled_message",
 	"extra.show_mute_icon",
 	"extra.sms_channel",
@@ -427,11 +424,9 @@ const char * locale_real_names[] =
 	"extra.zapit_fe_timeout",
 	"extra.zapit_hvoltage",
 	"extra.zapit_make_bouquet",
-	"extra.zapit_menu",
 	"extra.zapit_motor_speed",
 	"extra.zapit_scanpids",
 	"extra.zapit_sdt_changed",
-	"extra.zapit_write_names",
 	"fan_speed",
 	"favorites.addchannel",
 	"favorites.bouquetname",
@@ -1050,7 +1045,6 @@ const char * locale_real_names[] =
 	"personalize.button_yellow",
 	"personalize.disabled",
 	"personalize.enabled",
-	"personalize.features",
 	"personalize.head",
 	"personalize.help",
 	"personalize.help_line1",
@@ -1072,7 +1066,6 @@ const char * locale_real_names[] =
 	"personalize.pinprotect",
 	"personalize.pinstatus",
 	"personalize.plugins",
-	"personalize.setupmenuwithpin",
 	"personalize.usermenu_preferred_buttons",
 	"personalize.usermenu_show_cancel",
 	"personalize.visible",