diff --git a/java/res/drawable-hdpi/btn_keyboard_normal_metal.9.png b/java/res/drawable-hdpi/btn_keyboard_normal_metal.9.png
deleted file mode 100644
index b29d6d1..0000000
--- a/java/res/drawable-hdpi/btn_keyboard_normal_metal.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_toggle_off.png b/java/res/drawable-hdpi/btn_keyboard_toggle_off.png
deleted file mode 100644
index bfe7840..0000000
--- a/java/res/drawable-hdpi/btn_keyboard_toggle_off.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_toggle_on.png b/java/res/drawable-hdpi/btn_keyboard_toggle_on.png
deleted file mode 100644
index 0a1221e..0000000
--- a/java/res/drawable-hdpi/btn_keyboard_toggle_on.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_led_off.9.png b/java/res/drawable-hdpi/btn_led_off.9.png
deleted file mode 100644
index a60f965..0000000
--- a/java/res/drawable-hdpi/btn_led_off.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_led_on.9.png b/java/res/drawable-hdpi/btn_led_on.9.png
deleted file mode 100644
index c902609..0000000
--- a/java/res/drawable-hdpi/btn_led_on.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/dialog_top_dark_bottom_medium.9.png b/java/res/drawable-hdpi/dialog_top_dark_bottom_medium.9.png
deleted file mode 100644
index ab6c036..0000000
--- a/java/res/drawable-hdpi/dialog_top_dark_bottom_medium.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_dialog_alert_large.png b/java/res/drawable-hdpi/ic_dialog_alert_large.png
deleted file mode 100755
index 7e2646d..0000000
--- a/java/res/drawable-hdpi/ic_dialog_alert_large.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_dialog_voice_input.png b/java/res/drawable-hdpi/ic_dialog_voice_input.png
deleted file mode 100755
index 11a3cfe..0000000
--- a/java/res/drawable-hdpi/ic_dialog_voice_input.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_dialog_wave_0_0.png b/java/res/drawable-hdpi/ic_dialog_wave_0_0.png
deleted file mode 100755
index 33023c3..0000000
--- a/java/res/drawable-hdpi/ic_dialog_wave_0_0.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_dialog_wave_1_3.png b/java/res/drawable-hdpi/ic_dialog_wave_1_3.png
deleted file mode 100755
index 662686c..0000000
--- a/java/res/drawable-hdpi/ic_dialog_wave_1_3.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_dialog_wave_2_3.png b/java/res/drawable-hdpi/ic_dialog_wave_2_3.png
deleted file mode 100755
index e23ada5..0000000
--- a/java/res/drawable-hdpi/ic_dialog_wave_2_3.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_dialog_wave_3_3.png b/java/res/drawable-hdpi/ic_dialog_wave_3_3.png
deleted file mode 100755
index 5fe5492..0000000
--- a/java/res/drawable-hdpi/ic_dialog_wave_3_3.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_dialog_wave_4_3.png b/java/res/drawable-hdpi/ic_dialog_wave_4_3.png
deleted file mode 100755
index 81b803f..0000000
--- a/java/res/drawable-hdpi/ic_dialog_wave_4_3.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_trans_background.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_trans_background.9.png
deleted file mode 100644
index fd7366e..0000000
--- a/java/res/drawable-hdpi/keyboard_popup_panel_trans_background.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_tabprev.png b/java/res/drawable-hdpi/sym_bkeyboard_tabprev.png
deleted file mode 100644
index eb4f0eb..0000000
--- a/java/res/drawable-hdpi/sym_bkeyboard_tabprev.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_tabprev.png b/java/res/drawable-hdpi/sym_keyboard_feedback_tabprev.png
deleted file mode 100644
index 36f6b53..0000000
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_tabprev.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_tabprev.png b/java/res/drawable-hdpi/sym_keyboard_tabprev.png
deleted file mode 100644
index 51bff1b..0000000
--- a/java/res/drawable-hdpi/sym_keyboard_tabprev.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_normal_metal.9.png b/java/res/drawable-mdpi/btn_keyboard_normal_metal.9.png
deleted file mode 100644
index f4fe0a8..0000000
--- a/java/res/drawable-mdpi/btn_keyboard_normal_metal.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_toggle_off.png b/java/res/drawable-mdpi/btn_keyboard_toggle_off.png
deleted file mode 100644
index 21399a4..0000000
--- a/java/res/drawable-mdpi/btn_keyboard_toggle_off.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_toggle_on.png b/java/res/drawable-mdpi/btn_keyboard_toggle_on.png
deleted file mode 100644
index 22d5683..0000000
--- a/java/res/drawable-mdpi/btn_keyboard_toggle_on.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_led_off.9.png b/java/res/drawable-mdpi/btn_led_off.9.png
deleted file mode 100644
index 68ce7a6..0000000
--- a/java/res/drawable-mdpi/btn_led_off.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_led_on.9.png b/java/res/drawable-mdpi/btn_led_on.9.png
deleted file mode 100644
index fe77abb..0000000
--- a/java/res/drawable-mdpi/btn_led_on.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/dialog_top_dark_bottom_medium.9.png b/java/res/drawable-mdpi/dialog_top_dark_bottom_medium.9.png
deleted file mode 100644
index cf7ecaf..0000000
--- a/java/res/drawable-mdpi/dialog_top_dark_bottom_medium.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_dialog_alert_large.png b/java/res/drawable-mdpi/ic_dialog_alert_large.png
deleted file mode 100644
index 2d4a164..0000000
--- a/java/res/drawable-mdpi/ic_dialog_alert_large.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_dialog_voice_input.png b/java/res/drawable-mdpi/ic_dialog_voice_input.png
deleted file mode 100644
index d289141..0000000
--- a/java/res/drawable-mdpi/ic_dialog_voice_input.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_dialog_wave_0_0.png b/java/res/drawable-mdpi/ic_dialog_wave_0_0.png
deleted file mode 100644
index 9c3c28f..0000000
--- a/java/res/drawable-mdpi/ic_dialog_wave_0_0.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_dialog_wave_1_3.png b/java/res/drawable-mdpi/ic_dialog_wave_1_3.png
deleted file mode 100644
index d33bd0d..0000000
--- a/java/res/drawable-mdpi/ic_dialog_wave_1_3.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_dialog_wave_2_3.png b/java/res/drawable-mdpi/ic_dialog_wave_2_3.png
deleted file mode 100644
index 5094a6e..0000000
--- a/java/res/drawable-mdpi/ic_dialog_wave_2_3.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_dialog_wave_3_3.png b/java/res/drawable-mdpi/ic_dialog_wave_3_3.png
deleted file mode 100644
index 6991756..0000000
--- a/java/res/drawable-mdpi/ic_dialog_wave_3_3.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_dialog_wave_4_3.png b/java/res/drawable-mdpi/ic_dialog_wave_4_3.png
deleted file mode 100644
index af5a84c..0000000
--- a/java/res/drawable-mdpi/ic_dialog_wave_4_3.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_trans_background.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_trans_background.9.png
deleted file mode 100644
index 4ba2a49..0000000
--- a/java/res/drawable-mdpi/keyboard_popup_panel_trans_background.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_tabprev.png b/java/res/drawable-mdpi/sym_bkeyboard_tabprev.png
deleted file mode 100644
index 5298291..0000000
--- a/java/res/drawable-mdpi/sym_bkeyboard_tabprev.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_tabprev.png b/java/res/drawable-mdpi/sym_keyboard_feedback_tabprev.png
deleted file mode 100644
index d4b3e7d..0000000
--- a/java/res/drawable-mdpi/sym_keyboard_feedback_tabprev.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_tabprev.png b/java/res/drawable-mdpi/sym_keyboard_tabprev.png
deleted file mode 100644
index eb90872..0000000
--- a/java/res/drawable-mdpi/sym_keyboard_tabprev.png
+++ /dev/null
Binary files differ
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index c72cba7..ef5127e 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -332,9 +332,9 @@
     <!-- Inform the user that a particular language has an available dictionary -->
     <string name="has_dictionary">Dictionary available</string>
 
-    <!-- Option to send logs -->
+    <!-- Preferences item for enabling to send user statistics to Google.   -->
     <string name="prefs_enable_log">Enable user feedback</string>
-    <!-- Description for sending logs -->
+    <!-- Description for enabling to send user statistics to Google. -->
     <string name="prefs_description_log">Help improve this input method editor by automatically sending usage statistics and crash reports to Google.</string>
 
     <string name="keyboard_layout">Keyboard Theme</string>
@@ -357,8 +357,6 @@
         <item>3</item>
     </string-array>
 
-    <string name="prefs_debug_mode">Debug (Temporary)</string>
-
     <string name="subtype_mode_keyboard">keyboard</string>
     <string name="subtype_mode_voice">voice</string>
 </resources>
diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml
index 472f8be..0457395 100644
--- a/java/res/xml-da/kbd_qwerty.xml
+++ b/java/res/xml-da/kbd_qwerty.xml
@@ -117,8 +117,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
@@ -135,8 +133,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -155,8 +151,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -174,8 +168,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
@@ -192,8 +184,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
diff --git a/java/res/xml-da/kbd_qwerty_black.xml b/java/res/xml-da/kbd_qwerty_black.xml
index 2b41cf1..575f0fa 100644
--- a/java/res/xml-da/kbd_qwerty_black.xml
+++ b/java/res/xml-da/kbd_qwerty_black.xml
@@ -117,8 +117,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
@@ -135,8 +133,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -155,8 +151,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -174,8 +168,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
@@ -192,8 +184,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
diff --git a/java/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml
index da833b2..827ad62 100755
--- a/java/res/xml-de/kbd_qwerty.xml
+++ b/java/res/xml-de/kbd_qwerty.xml
@@ -97,8 +97,6 @@
     
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" 
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1"
                 android:keyWidth="10%p"/>
@@ -114,8 +112,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -134,8 +130,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -153,8 +147,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
@@ -170,8 +162,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
diff --git a/java/res/xml-de/kbd_qwerty_black.xml b/java/res/xml-de/kbd_qwerty_black.xml
index 366f871..18fdc7d 100755
--- a/java/res/xml-de/kbd_qwerty_black.xml
+++ b/java/res/xml-de/kbd_qwerty_black.xml
@@ -97,8 +97,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1"
                 android:keyWidth="10%p"/>
@@ -114,8 +112,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -134,8 +130,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -153,8 +147,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
@@ -170,8 +162,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml
index 77076fd..7df32d9 100644
--- a/java/res/xml-fr/kbd_qwerty.xml
+++ b/java/res/xml-fr/kbd_qwerty.xml
@@ -99,8 +99,6 @@
     
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" 
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
@@ -116,8 +114,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -136,8 +132,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -155,8 +149,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
@@ -172,8 +164,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
diff --git a/java/res/xml-fr/kbd_qwerty_black.xml b/java/res/xml-fr/kbd_qwerty_black.xml
index 1b799a5..78b1da9 100644
--- a/java/res/xml-fr/kbd_qwerty_black.xml
+++ b/java/res/xml-fr/kbd_qwerty_black.xml
@@ -99,8 +99,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
@@ -116,8 +114,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -136,8 +132,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -155,8 +149,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
@@ -172,8 +164,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml
index b893f1a..0ce5d36 100755
--- a/java/res/xml-iw/kbd_qwerty.xml
+++ b/java/res/xml-iw/kbd_qwerty.xml
@@ -71,8 +71,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" 
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
@@ -88,8 +86,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -108,8 +104,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -127,8 +121,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
@@ -144,8 +136,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml
index 0dcf513..2bf0c2a 100755
--- a/java/res/xml-iw/kbd_qwerty_black.xml
+++ b/java/res/xml-iw/kbd_qwerty_black.xml
@@ -71,8 +71,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
@@ -88,8 +86,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -108,8 +104,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -127,8 +121,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
@@ -144,8 +136,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml
index d2f0258..a9e6adc 100644
--- a/java/res/xml-nb/kbd_qwerty.xml
+++ b/java/res/xml-nb/kbd_qwerty.xml
@@ -115,8 +115,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
@@ -133,8 +131,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -153,8 +149,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -172,8 +166,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
@@ -190,8 +182,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml
index 150ff7f..8d23cc1 100644
--- a/java/res/xml-nb/kbd_qwerty_black.xml
+++ b/java/res/xml-nb/kbd_qwerty_black.xml
@@ -115,8 +115,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
@@ -133,8 +131,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -153,8 +149,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -172,8 +166,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
@@ -190,8 +182,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml
index 9773a30..0c49f37 100755
--- a/java/res/xml-ru/kbd_qwerty.xml
+++ b/java/res/xml-ru/kbd_qwerty.xml
@@ -83,8 +83,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" 
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
@@ -100,8 +98,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -120,8 +116,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -139,8 +133,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
@@ -156,8 +148,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
diff --git a/java/res/xml-ru/kbd_qwerty_black.xml b/java/res/xml-ru/kbd_qwerty_black.xml
index 4923be0..a9c88b7 100755
--- a/java/res/xml-ru/kbd_qwerty_black.xml
+++ b/java/res/xml-ru/kbd_qwerty_black.xml
@@ -83,8 +83,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
@@ -100,8 +98,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -120,8 +116,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -139,8 +133,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
@@ -156,8 +148,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
diff --git a/java/res/xml-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml
index e4884a8..117db4c 100644
--- a/java/res/xml-sr/kbd_qwerty.xml
+++ b/java/res/xml-sr/kbd_qwerty.xml
@@ -79,8 +79,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
@@ -96,8 +94,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -116,8 +112,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -135,8 +129,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
@@ -152,8 +144,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe"
                 android:keyWidth="10%p"/>
diff --git a/java/res/xml-sr/kbd_qwerty_black.xml b/java/res/xml-sr/kbd_qwerty_black.xml
index 30d094a..91b118f 100644
--- a/java/res/xml-sr/kbd_qwerty_black.xml
+++ b/java/res/xml-sr/kbd_qwerty_black.xml
@@ -79,8 +79,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
@@ -96,8 +94,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -116,8 +112,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -135,8 +129,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
@@ -152,8 +144,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe"
                 android:keyWidth="10%p"/>
diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml
index d4ffa4d..1ffa9dd 100644
--- a/java/res/xml-sv/kbd_qwerty.xml
+++ b/java/res/xml-sv/kbd_qwerty.xml
@@ -119,8 +119,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
@@ -137,8 +135,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -157,8 +153,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
@@ -176,8 +170,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
@@ -194,8 +186,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml
index 6604bc8..af8cda6 100644
--- a/java/res/xml-sv/kbd_qwerty_black.xml
+++ b/java/res/xml-sv/kbd_qwerty_black.xml
@@ -119,8 +119,6 @@
 
     <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
@@ -137,8 +135,6 @@
 
     <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="/" android:keyWidth="10%p"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -157,8 +153,6 @@
 
     <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:keyLabel="\@"/>
         <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
@@ -176,8 +170,6 @@
 
     <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
@@ -194,8 +186,6 @@
 
     <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="_"
                 android:keyWidth="20%p" android:keyEdgeFlags="left"/>
         <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
                 android:iconPreview="@drawable/sym_keyboard_feedback_mic"
diff --git a/java/res/xml/kbd_extension.xml b/java/res/xml/kbd_extension.xml
deleted file mode 100755
index c64f666..0000000
--- a/java/res/xml/kbd_extension.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
-    android:keyWidth="10%p"
-    android:horizontalGap="0px"
-    android:verticalGap="0px"
-    android:keyHeight="@dimen/key_height"
-    >
-
-    <Row android:rowEdgeFlags="top">
-        <Key android:keyLabel="!" android:keyEdgeFlags="left"/>
-        <Key android:keyLabel="\@"/>
-        <Key android:keyLabel="\#"/>        
-        <Key android:keyLabel="&amp;"/>
-        <Key android:keyLabel="-"/>
-        <Key android:keyLabel="\'"/>
-        <Key android:keyLabel=":"/>
-        <Key android:keyLabel="&quot;"/>
-        <Key android:keyLabel="/"/>
-        <Key android:keyLabel="\?" android:keyEdgeFlags="right"
-        />
-    </Row>
-
-    <Row android:rowEdgeFlags="bottom">
-        <Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left"
-        />
-        <Key android:codes="50" android:keyLabel="2"
-        />
-        <Key android:codes="51" android:keyLabel="3"
-        />
-        <Key android:codes="52" android:keyLabel="4"
-        />
-        <Key android:codes="53" android:keyLabel="5"
-        />
-        <Key android:codes="54" android:keyLabel="6"/>
-        <Key android:codes="55" android:keyLabel="7"
-        />
-        <Key android:codes="56" android:keyLabel="8"/>
-        <Key android:codes="57" android:keyLabel="9"/>
-        <Key android:codes="48" android:keyLabel="0" 
-                android:keyEdgeFlags="right"/>
-    </Row>    
-</Keyboard>
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 11cc3ac..c4ffeef 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -105,21 +105,6 @@
             android:defaultValue="@bool/enable_autocorrect"
             android:dependency="show_suggestions"
             />
-
-        <CheckBoxPreference
-            android:key="bigram_suggestion"
-            android:title="@string/bigram_suggestion"
-            android:summary="@string/bigram_suggestion_summary"
-            android:persistent="true"
-            android:defaultValue="true"
-            android:dependency="auto_complete"
-            />
     </PreferenceCategory>            
 
-<CheckBoxPreference
-            android:key="debug_mode"
-            android:title="@string/prefs_debug_mode"
-            android:persistent="true"
-            android:defaultValue="false"
-            />
 </PreferenceScreen>
diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
index dec29b7..45a54b1 100644
--- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
@@ -261,14 +261,6 @@
                     || id.mXml == R.xml.kbd_symbols_black), mHasVoice);
             keyboard.setLanguageSwitcher(mLanguageSwitcher);
             keyboard.setBlackFlag(isBlackSym());
-            if (id.mKeyboardMode == KEYBOARDMODE_NORMAL
-                    || id.mKeyboardMode == KEYBOARDMODE_URL
-                    || id.mKeyboardMode == KEYBOARDMODE_IM
-                    || id.mKeyboardMode == KEYBOARDMODE_EMAIL
-                    || id.mKeyboardMode == KEYBOARDMODE_WEB
-                    ) {
-                keyboard.setExtension(R.xml.kbd_extension);
-            }
 
             if (id.mEnableShiftLock) {
                 keyboard.enableShiftLock();
@@ -439,7 +431,6 @@
                             mLayoutId + "," + newLayout, e);
                 }
             }
-            mInputView.setExtentionLayoutResId(THEMES[newLayout]);
             mInputView.setOnKeyboardActionListener(mInputMethodService);
             mLayoutId = newLayout;
         }
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 37ae43d..f26cbc0 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -94,7 +94,7 @@
     private static final String PREF_QUICK_FIXES = "quick_fixes";
     private static final String PREF_SHOW_SUGGESTIONS = "show_suggestions";
     private static final String PREF_AUTO_COMPLETE = "auto_complete";
-    private static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion";
+    //private static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion";
     private static final String PREF_VOICE_MODE = "voice_mode";
 
     // Whether or not the user has used voice input before (and thus, whether to show the
@@ -193,7 +193,8 @@
     private boolean mAutoSpace;
     private boolean mJustAddedAutoSpace;
     private boolean mAutoCorrectEnabled;
-    private boolean mBigramSuggestionEnabled;
+    // Bigram Suggestion is disabled in this version.
+    private final boolean mBigramSuggestionEnabled = false;
     private boolean mAutoCorrectOn;
     // TODO move this state variable outside LatinIME
     private boolean mCapsLock;
@@ -2356,7 +2357,8 @@
         }
         mAutoCorrectEnabled = sp.getBoolean(PREF_AUTO_COMPLETE,
                 mResources.getBoolean(R.bool.enable_autocorrect)) & mShowSuggestions;
-        mBigramSuggestionEnabled = sp.getBoolean(PREF_BIGRAM_SUGGESTIONS, true) & mShowSuggestions;
+        //mBigramSuggestionEnabled = sp.getBoolean(
+        //        PREF_BIGRAM_SUGGESTIONS, true) & mShowSuggestions;
         updateCorrectionMode();
         updateAutoTextEnabled(mResources.getConfiguration().locale);
         mLanguageSwitcher.loadLocales(sp);
diff --git a/java/src/com/android/inputmethod/latin/LatinIMESettings.java b/java/src/com/android/inputmethod/latin/LatinIMESettings.java
index 806ef00..565c1e6 100644
--- a/java/src/com/android/inputmethod/latin/LatinIMESettings.java
+++ b/java/src/com/android/inputmethod/latin/LatinIMESettings.java
@@ -76,7 +76,7 @@
         mLogger = VoiceInputLogger.getLogger(this);
 
         mDebugMode = (CheckBoxPreference) findPreference(DEBUG_MODE_KEY);
-        updateDebugMode(mDebugMode.isChecked());
+        updateDebugMode();
     }
 
     @Override
@@ -111,16 +111,20 @@
                 showVoiceConfirmation();
             }
         } else if (key.equals(DEBUG_MODE_KEY)) {
-            updateDebugMode(prefs.getBoolean(DEBUG_MODE_KEY, false));
+            if (mDebugMode != null) {
+                mDebugMode.setChecked(prefs.getBoolean(DEBUG_MODE_KEY, false));
+                updateDebugMode();
+            }
         }
         mVoiceOn = !(prefs.getString(VOICE_SETTINGS_KEY, mVoiceModeOff).equals(mVoiceModeOff));
         updateVoiceModeSummary();
     }
 
-    private void updateDebugMode(boolean isDebugMode) {
+    private void updateDebugMode() {
         if (mDebugMode == null) {
             return;
         }
+        boolean isDebugMode = mDebugMode.isChecked();
         String version = "";
         try {
             PackageInfo info = getPackageManager().getPackageInfo(getPackageName(), 0);
@@ -134,8 +138,8 @@
             mDebugMode.setSummary("");
         } else {
             mDebugMode.setEnabled(true);
-            mDebugMode.setTitle(getResources().getString(R.string.prefs_debug_mode));
             mDebugMode.setSummary(version);
+            mDebugMode.setSummary("");
         }
     }
 
diff --git a/java/src/com/android/inputmethod/latin/LatinIMEUtil.java b/java/src/com/android/inputmethod/latin/LatinIMEUtil.java
index 838b4fe..93ad407 100644
--- a/java/src/com/android/inputmethod/latin/LatinIMEUtil.java
+++ b/java/src/com/android/inputmethod/latin/LatinIMEUtil.java
@@ -54,9 +54,6 @@
         }
 
         public boolean tryGCOrWait(String metaData, Throwable t) {
-            if (LatinImeLogger.sDBG) {
-                Log.d(TAG, "Encountered Exception or Error. Try GC.");
-            }
             if (mGCTryCount == 0) {
                 System.gc();
             }
diff --git a/java/src/com/android/inputmethod/latin/LatinImeLogger.java b/java/src/com/android/inputmethod/latin/LatinImeLogger.java
index 716f720..007d0cc 100644
--- a/java/src/com/android/inputmethod/latin/LatinImeLogger.java
+++ b/java/src/com/android/inputmethod/latin/LatinImeLogger.java
@@ -20,907 +20,52 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.inputmethodservice.Keyboard;
-import android.os.AsyncTask;
-import android.os.DropBoxManager;
-import android.preference.PreferenceManager;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.util.Log;
-import android.util.Pair;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 
 public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChangeListener {
-    private static final String TAG = "LatinIMELogs";
-    public static boolean sDBG = false;
-    private static boolean sPRINTLOGGING = false;
-    // SUPPRESS_EXCEPTION should be true when released to public.
-    private static final boolean SUPPRESS_EXCEPTION = true;
-    // DEFAULT_LOG_ENABLED should be false when released to public.
-    private static final boolean DEFAULT_LOG_ENABLED = false;
-
-    private static final long MINIMUMSENDINTERVAL = 300 * DateUtils.SECOND_IN_MILLIS; // 300 sec
-    private static final long MINIMUMCOUNTINTERVAL = 20 * DateUtils.SECOND_IN_MILLIS; // 20 sec
-    private static final long MINIMUMSENDSIZE = 40;
-    private static final char SEPARATER = ';';
-    private static final char NULL_CHAR = '\uFFFC';
-    private static final int EXCEPTION_MAX_LENGTH = 400;
-    private static final int INVALID_COORDINATE = -2;
-
-    // ID_MANUALSUGGESTION has been replaced by ID_MANUALSUGGESTION_WITH_DATATYPE
-    // private static final int ID_MANUALSUGGESTION = 0;
-    // private static final int ID_AUTOSUGGESTIONCANCELLED = 1;
-    // private static final int ID_AUTOSUGGESTION = 2;
-    private static final int ID_INPUT_COUNT = 3;
-    private static final int ID_DELETE_COUNT = 4;
-    private static final int ID_WORD_COUNT = 5;
-    private static final int ID_ACTUAL_CHAR_COUNT = 6;
-    private static final int ID_THEME_ID = 7;
-    private static final int ID_SETTING_AUTO_COMPLETE = 8;
-    private static final int ID_VERSION = 9;
-    private static final int ID_EXCEPTION = 10;
-    private static final int ID_MANUALSUGGESTIONCOUNT = 11;
-    private static final int ID_AUTOSUGGESTIONCANCELLEDCOUNT = 12;
-    private static final int ID_AUTOSUGGESTIONCOUNT = 13;
-    private static final int ID_LANGUAGES = 14;
-    private static final int ID_MANUALSUGGESTION_WITH_DATATYPE = 15;
-    private static final int ID_AUTOSUGGESTIONCANCELLED_WITH_COORDINATES = 16;
-    private static final int ID_AUTOSUGGESTION_WITH_COORDINATES = 17;
-
-    private static final String PREF_ENABLE_LOG = "enable_logging";
-    private static final String PREF_DEBUG_MODE = "debug_mode";
-    private static final String PREF_AUTO_COMPLETE = "auto_complete";
-
-    public static boolean sLogEnabled = true;
-    /* package */ static LatinImeLogger sLatinImeLogger = new LatinImeLogger();
-    // Store the last auto suggested word.
-    // This is required for a cancellation log of auto suggestion of that word.
-    /* package */ static String sLastAutoSuggestBefore;
-    /* package */ static String sLastAutoSuggestAfter;
-    /* package */ static String sLastAutoSuggestSeparator;
-    private static int[] sLastAutoSuggestXCoordinates;
-    private static int[] sLastAutoSuggestYCoordinates;
-    // This value holds MAIN, USER, AUTO, etc...
-    private static int sLastAutoSuggestDicTypeId;
-    // This value holds 0 (= unigram), 1 (= bigram) etc...
-    private static int sLastAutoSuggestDataType;
-    private static HashMap<String, Pair<Integer, Integer>> sSuggestDicMap
-            = new HashMap<String, Pair<Integer, Integer>>();
-    private static String[] sPreviousWords;
-    private static DebugKeyEnabler sDebugKeyEnabler = new DebugKeyEnabler();
-    private static int sKeyboardWidth = 0;
-    private static int sKeyboardHeight = 0;
-
-    private ArrayList<LogEntry> mLogBuffer = null;
-    private ArrayList<LogEntry> mPrivacyLogBuffer = null;
-    /* package */ RingCharBuffer mRingCharBuffer = null;
-
-    private Context mContext = null;
-    private DropBoxManager mDropBox = null;
-    private AddTextToDropBoxTask mAddTextToDropBoxTask;
-    private long mLastTimeActive;
-    private long mLastTimeSend;
-    private long mLastTimeCountEntry;
-
-    private String mThemeId;
-    private String mSelectedLanguages;
-    private String mCurrentLanguage;
-    private int mDeleteCount;
-    private int mInputCount;
-    private int mWordCount;
-    private int[] mAutoSuggestCountPerDic = new int[Suggest.DIC_TYPE_LAST_ID + 1];
-    private int[] mManualSuggestCountPerDic = new int[Suggest.DIC_TYPE_LAST_ID + 1];
-    private int[] mAutoCancelledCountPerDic = new int[Suggest.DIC_TYPE_LAST_ID + 1];
-    private int mActualCharCount;
-
-    private static class LogEntry implements Comparable<LogEntry> {
-        public final int mTag;
-        public final String[] mData;
-        public long mTime;
-
-        public LogEntry (long time, int tag, String[] data) {
-            mTag = tag;
-            mTime = time;
-            mData = data;
-        }
-
-        public int compareTo(LogEntry log2) {
-            if (mData.length == 0 && log2.mData.length == 0) {
-                return 0;
-            } else if (mData.length == 0) {
-                return 1;
-            } else if (log2.mData.length == 0) {
-                return -1;
-            }
-            return log2.mData[0].compareTo(mData[0]);
-        }
-    }
-
-    private class AddTextToDropBoxTask extends AsyncTask<Void, Void, Void> {
-        private final DropBoxManager mDropBox;
-        private final long mTime;
-        private final String mData;
-        public AddTextToDropBoxTask(DropBoxManager db, long time, String data) {
-            mDropBox = db;
-            mTime = time;
-            mData = data;
-        }
-        @Override
-        protected Void doInBackground(Void... params) {
-            if (sPRINTLOGGING) {
-                Log.d(TAG, "Commit log: " + mData);
-            }
-            mDropBox.addText(TAG, mData);
-            return null;
-        }
-        @Override
-        protected void onPostExecute(Void v) {
-            mLastTimeSend = mTime;
-        }
-    }
-
-    private void initInternal(Context context) {
-        mContext = context;
-        mDropBox = (DropBoxManager) mContext.getSystemService(Context.DROPBOX_SERVICE);
-        mLastTimeSend = System.currentTimeMillis();
-        mLastTimeActive = mLastTimeSend;
-        mLastTimeCountEntry = mLastTimeSend;
-        mDeleteCount = 0;
-        mInputCount = 0;
-        mWordCount = 0;
-        mActualCharCount = 0;
-        Arrays.fill(mAutoSuggestCountPerDic, 0);
-        Arrays.fill(mManualSuggestCountPerDic, 0);
-        Arrays.fill(mAutoCancelledCountPerDic, 0);
-        mLogBuffer = new ArrayList<LogEntry>();
-        mPrivacyLogBuffer = new ArrayList<LogEntry>();
-        mRingCharBuffer = new RingCharBuffer(context);
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        sLogEnabled = prefs.getBoolean(PREF_ENABLE_LOG, DEFAULT_LOG_ENABLED);
-        mThemeId = prefs.getString(KeyboardSwitcher.PREF_KEYBOARD_LAYOUT,
-                KeyboardSwitcher.DEFAULT_LAYOUT_ID);
-        mSelectedLanguages = prefs.getString(LatinIME.PREF_SELECTED_LANGUAGES, "");
-        mCurrentLanguage = prefs.getString(LatinIME.PREF_INPUT_LANGUAGE, "");
-        sPRINTLOGGING = prefs.getBoolean(PREF_DEBUG_MODE, sPRINTLOGGING);
-        sDBG = sPRINTLOGGING;
-        prefs.registerOnSharedPreferenceChangeListener(this);
-    }
-
-    /**
-     * Clear all logged data
-     */
-    private void reset() {
-        mDeleteCount = 0;
-        mInputCount = 0;
-        mWordCount = 0;
-        mActualCharCount = 0;
-        Arrays.fill(mAutoSuggestCountPerDic, 0);
-        Arrays.fill(mManualSuggestCountPerDic, 0);
-        Arrays.fill(mAutoCancelledCountPerDic, 0);
-        mLogBuffer.clear();
-        mPrivacyLogBuffer.clear();
-    }
-
-    public void destroy() {
-        LatinIMEUtil.cancelTask(mAddTextToDropBoxTask, false);
-    }
-
-    /**
-     * Check if the input string is safe as an entry or not.
-     */
-    private static boolean checkStringDataSafe(String s) {
-        if (sDBG) {
-            Log.d(TAG, "Check String safety: " + s);
-        }
-        for (int i = 0; i < s.length(); ++i) {
-            if (Character.isDigit(s.charAt(i))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private void addCountEntry(long time) {
-        if (sPRINTLOGGING) {
-            Log.d(TAG, "Log counts. (4)");
-        }
-        mLogBuffer.add(new LogEntry (time, ID_DELETE_COUNT,
-                new String[] {String.valueOf(mDeleteCount)}));
-        mLogBuffer.add(new LogEntry (time, ID_INPUT_COUNT,
-                new String[] {String.valueOf(mInputCount)}));
-        mLogBuffer.add(new LogEntry (time, ID_WORD_COUNT,
-                new String[] {String.valueOf(mWordCount)}));
-        mLogBuffer.add(new LogEntry (time, ID_ACTUAL_CHAR_COUNT,
-                new String[] {String.valueOf(mActualCharCount)}));
-        mDeleteCount = 0;
-        mInputCount = 0;
-        mWordCount = 0;
-        mActualCharCount = 0;
-        mLastTimeCountEntry = time;
-    }
-
-    private void addSuggestionCountEntry(long time) {
-        if (sPRINTLOGGING) {
-            Log.d(TAG, "log suggest counts. (1)");
-        }
-        String[] s = new String[mAutoSuggestCountPerDic.length];
-        for (int i = 0; i < s.length; ++i) {
-            s[i] = String.valueOf(mAutoSuggestCountPerDic[i]);
-        }
-        mLogBuffer.add(new LogEntry(time, ID_AUTOSUGGESTIONCOUNT, s));
-
-        s = new String[mAutoCancelledCountPerDic.length];
-        for (int i = 0; i < s.length; ++i) {
-            s[i] = String.valueOf(mAutoCancelledCountPerDic[i]);
-        }
-        mLogBuffer.add(new LogEntry(time, ID_AUTOSUGGESTIONCANCELLEDCOUNT, s));
-
-        s = new String[mManualSuggestCountPerDic.length];
-        for (int i = 0; i < s.length; ++i) {
-            s[i] = String.valueOf(mManualSuggestCountPerDic[i]);
-        }
-        mLogBuffer.add(new LogEntry(time, ID_MANUALSUGGESTIONCOUNT, s));
-
-        Arrays.fill(mAutoSuggestCountPerDic, 0);
-        Arrays.fill(mManualSuggestCountPerDic, 0);
-        Arrays.fill(mAutoCancelledCountPerDic, 0);
-    }
-
-    private void addThemeIdEntry(long time) {
-        if (sPRINTLOGGING) {
-            Log.d(TAG, "Log theme Id. (1)");
-        }
-        // TODO: Not to convert theme ID here. Currently "2" is treated as "6" in a log server.
-        if (mThemeId.equals("2")) {
-            mThemeId = "6";
-        } else if (mThemeId.equals("3")) {
-            mThemeId = "7";
-        }
-        mLogBuffer.add(new LogEntry (time, ID_THEME_ID,
-                new String[] {mThemeId}));
-    }
-
-    private void addLanguagesEntry(long time) {
-        if (sPRINTLOGGING) {
-            Log.d(TAG, "Log language settings. (1)");
-        }
-        // CurrentLanguage and SelectedLanguages will be blank if user doesn't use multi-language
-        // switching.
-        if (TextUtils.isEmpty(mCurrentLanguage)) {
-            mCurrentLanguage = mContext.getResources().getConfiguration().locale.toString();
-        }
-        mLogBuffer.add(new LogEntry (time, ID_LANGUAGES,
-                new String[] {mCurrentLanguage , mSelectedLanguages}));
-    }
-
-    private void addSettingsEntry(long time) {
-        if (sPRINTLOGGING) {
-            Log.d(TAG, "Log settings. (1)");
-        }
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-        mLogBuffer.add(new LogEntry (time, ID_SETTING_AUTO_COMPLETE,
-                new String[] {String.valueOf(prefs.getBoolean(PREF_AUTO_COMPLETE,
-                        mContext.getResources().getBoolean(R.bool.enable_autocorrect)))}));
-    }
-
-    private void addVersionNameEntry(long time) {
-        if (sPRINTLOGGING) {
-            Log.d(TAG, "Log Version. (1)");
-        }
-        try {
-            PackageInfo info = mContext.getPackageManager().getPackageInfo(
-                    mContext.getPackageName(), 0);
-            mLogBuffer.add(new LogEntry (time, ID_VERSION,
-                    new String[] {String.valueOf(info.versionCode), info.versionName}));
-        } catch (NameNotFoundException e) {
-            Log.e(TAG, "Could not find version name.");
-        }
-    }
-
-    private void addExceptionEntry(long time, String[] data) {
-        if (sPRINTLOGGING) {
-            Log.d(TAG, "Log Exception. (1)");
-        }
-        mLogBuffer.add(new LogEntry(time, ID_EXCEPTION, data));
-    }
-
-    private void flushPrivacyLogSafely() {
-        if (sPRINTLOGGING) {
-            Log.d(TAG, "Log obfuscated data. (" + mPrivacyLogBuffer.size() + ")");
-        }
-        long now = System.currentTimeMillis();
-        Collections.sort(mPrivacyLogBuffer);
-        for (LogEntry l: mPrivacyLogBuffer) {
-            l.mTime = now;
-            mLogBuffer.add(l);
-        }
-        mPrivacyLogBuffer.clear();
-    }
-
-    /**
-     * Add an entry
-     * @param tag
-     * @param data
-     */
-    private void addData(int tag, Object data) {
-        switch (tag) {
-            case ID_DELETE_COUNT:
-                if (((mLastTimeActive - mLastTimeCountEntry) > MINIMUMCOUNTINTERVAL)
-                        || (mDeleteCount == 0 && mInputCount == 0)) {
-                    addCountEntry(mLastTimeActive);
-                }
-                mDeleteCount += (Integer)data;
-                break;
-            case ID_INPUT_COUNT:
-                if (((mLastTimeActive - mLastTimeCountEntry) > MINIMUMCOUNTINTERVAL)
-                        || (mDeleteCount == 0 && mInputCount == 0)) {
-                    addCountEntry(mLastTimeActive);
-                }
-                mInputCount += (Integer)data;
-                break;
-            case ID_MANUALSUGGESTION_WITH_DATATYPE:
-            case ID_AUTOSUGGESTION_WITH_COORDINATES:
-                ++mWordCount;
-                String[] dataStrings = (String[]) data;
-                if (dataStrings.length < 2) {
-                    if (sDBG) {
-                        Log.e(TAG, "The length of logged string array is invalid.");
-                    }
-                    break;
-                }
-                mActualCharCount += dataStrings[1].length();
-                if (checkStringDataSafe(dataStrings[0]) && checkStringDataSafe(dataStrings[1])) {
-                    mPrivacyLogBuffer.add(
-                            new LogEntry (System.currentTimeMillis(), tag, dataStrings));
-                } else {
-                    if (sDBG) {
-                        Log.d(TAG, "Skipped to add an entry because data is unsafe.");
-                    }
-                }
-                break;
-            case ID_AUTOSUGGESTIONCANCELLED_WITH_COORDINATES:
-                --mWordCount;
-                dataStrings = (String[]) data;
-                if (dataStrings.length < 2) {
-                    if (sDBG) {
-                        Log.e(TAG, "The length of logged string array is invalid.");
-                    }
-                    break;
-                }
-                mActualCharCount -= dataStrings[1].length();
-                if (checkStringDataSafe(dataStrings[0]) && checkStringDataSafe(dataStrings[1])) {
-                    mPrivacyLogBuffer.add(
-                            new LogEntry (System.currentTimeMillis(), tag, dataStrings));
-                } else {
-                    if (sDBG) {
-                        Log.d(TAG, "Skipped to add an entry because data is unsafe.");
-                    }
-                }
-                break;
-            case ID_EXCEPTION:
-                dataStrings = (String[]) data;
-                if (dataStrings.length < 2) {
-                    if (sDBG) {
-                        Log.e(TAG, "The length of logged string array is invalid.");
-                    }
-                    break;
-                }
-                addExceptionEntry(System.currentTimeMillis(), dataStrings);
-                break;
-            default:
-                if (sDBG) {
-                    Log.e(TAG, "Log Tag is not entried.");
-                }
-                break;
-        }
-    }
-
-    private void commitInternal() {
-        // if there is no log entry in mLogBuffer, will not send logs to DropBox.
-        if (!mLogBuffer.isEmpty() && (mAddTextToDropBoxTask == null
-                || mAddTextToDropBoxTask.getStatus() == AsyncTask.Status.FINISHED)) {
-            if (sPRINTLOGGING) {
-                Log.d(TAG, "Commit (" + mLogBuffer.size() + ")");
-            }
-            flushPrivacyLogSafely();
-            long now = System.currentTimeMillis();
-            addCountEntry(now);
-            addThemeIdEntry(now);
-            addLanguagesEntry(now);
-            addSettingsEntry(now);
-            addVersionNameEntry(now);
-            addSuggestionCountEntry(now);
-            String s = LogSerializer.createStringFromEntries(mLogBuffer);
-            reset();
-            mAddTextToDropBoxTask = (AddTextToDropBoxTask) new AddTextToDropBoxTask(
-                    mDropBox, now, s).execute();
-        }
-    }
-
-    private void commitInternalAndStopSelf() {
-        if (sDBG) {
-            Log.e(TAG, "Exception was thrown and let's die.");
-        }
-        commitInternal();
-        LatinIME ime = ((LatinIME) mContext);
-        ime.hideWindow();
-        ime.stopSelf();
-    }
-
-    private synchronized void sendLogToDropBox(int tag, Object s) {
-        long now = System.currentTimeMillis();
-        if (sDBG) {
-            String out = "";
-            if (s instanceof String[]) {
-                for (String str: ((String[]) s)) {
-                    out += str + ",";
-                }
-            } else if (s instanceof Integer) {
-                out += (Integer) s;
-            }
-            Log.d(TAG, "SendLog: " + tag + ";" + out + " -> will be sent after "
-                    + (- (now - mLastTimeSend - MINIMUMSENDINTERVAL) / 1000) + " sec.");
-        }
-        if (now - mLastTimeActive > MINIMUMSENDINTERVAL) {
-            // Send a log before adding an log entry if the last data is too old.
-            commitInternal();
-            addData(tag, s);
-        } else if (now - mLastTimeSend > MINIMUMSENDINTERVAL) {
-            // Send a log after adding an log entry.
-            addData(tag, s);
-            commitInternal();
-        } else {
-            addData(tag, s);
-        }
-        mLastTimeActive = now;
-    }
 
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (PREF_ENABLE_LOG.equals(key)) {
-            if (sharedPreferences.getBoolean(key, DEFAULT_LOG_ENABLED)) {
-                sLogEnabled = (mContext != null);
-            } else {
-                sLogEnabled = false;
-            }
-            if (sDebugKeyEnabler.check()) {
-                sharedPreferences.edit().putBoolean(PREF_DEBUG_MODE, true).commit();
-            }
-        } else if (KeyboardSwitcher.PREF_KEYBOARD_LAYOUT.equals(key)) {
-            mThemeId = sharedPreferences.getString(KeyboardSwitcher.PREF_KEYBOARD_LAYOUT,
-                    KeyboardSwitcher.DEFAULT_LAYOUT_ID);
-            addThemeIdEntry(mLastTimeActive);
-        } else if (PREF_DEBUG_MODE.equals(key)) {
-            sPRINTLOGGING = sharedPreferences.getBoolean(PREF_DEBUG_MODE, sPRINTLOGGING);
-            sDBG = sPRINTLOGGING;
-        } else if (LatinIME.PREF_INPUT_LANGUAGE.equals(key)) {
-            mCurrentLanguage = sharedPreferences.getString(LatinIME.PREF_INPUT_LANGUAGE, "");
-            addLanguagesEntry(mLastTimeActive);
-        } else if (LatinIME.PREF_INPUT_LANGUAGE.equals(key)) {
-            mSelectedLanguages = sharedPreferences.getString(LatinIME.PREF_SELECTED_LANGUAGES, "");
-        }
     }
 
     public static void init(Context context) {
-        sLatinImeLogger.initInternal(context);
     }
 
     public static void commit() {
-        if (sLogEnabled) {
-            if (System.currentTimeMillis() - sLatinImeLogger.mLastTimeActive > MINIMUMCOUNTINTERVAL
-                        || (sLatinImeLogger.mLogBuffer.size()
-                                + sLatinImeLogger.mPrivacyLogBuffer.size() > MINIMUMSENDSIZE)) {
-                sLatinImeLogger.commitInternal();
-            }
-        }
     }
 
     public static void onDestroy() {
-        sLatinImeLogger.commitInternal();
-        sLatinImeLogger.destroy();
     }
 
-    // TODO: Handle CharSequence instead of String
     public static void logOnManualSuggestion(String before, String after, int position
             , List<CharSequence> suggestions) {
-        if (sLogEnabled) {
-            // log punctuation
-            if (before.length() == 0 && after.length() == 1) {
-                sLatinImeLogger.sendLogToDropBox(ID_MANUALSUGGESTION_WITH_DATATYPE, new String[] {
-                        before, after, String.valueOf(position), ""});
-            } else if (!sSuggestDicMap.containsKey(after)) {
-                if (sDBG) {
-                    Log.e(TAG, "logOnManualSuggestion was cancelled: from unknown dic.");
-                }
-            } else {
-                int dicTypeId = sSuggestDicMap.get(after).first;
-                sLatinImeLogger.mManualSuggestCountPerDic[dicTypeId]++;
-                if (dicTypeId != Suggest.DIC_MAIN) {
-                    if (sDBG) {
-                        Log.d(TAG, "logOnManualSuggestion was cancelled: not from main dic.");
-                    }
-                    before = "";
-                    after = "";
-                    sPreviousWords = null;
-                }
-                // TODO: Don't send a log if this doesn't come from Main Dictionary.
-                {
-                    if (before.equals(after)) {
-                        before = "";
-                        after = "";
-                    }
-
-                    /* Example:
-                     * When user typed "Illegal imm" and picked "immigrants",
-                     * the suggestion list has "immigrants, immediate, immigrant".
-                     * At this time, the log strings will be something like below:
-                     * strings[0 = COLUMN_BEFORE_ID] = imm
-                     * strings[1 = COLUMN_AFTER_ID] = immigrants
-                     * strings[2 = COLUMN_PICKED_POSITION_ID] = 0
-                     * strings[3 = COLUMN_SUGGESTION_LENGTH_ID] = 3
-                     * strings[4 = COLUMN_PREVIOUS_WORDS_COUNT_ID] = 1
-                     * strings[5] = immigrants
-                     * strings[6] = immediate
-                     * strings[7] = immigrant
-                     * strings[8] = 1 (= bigram)
-                     * strings[9] = 0 (= unigram)
-                     * strings[10] = 1 (= bigram)
-                     * strings[11] = Illegal
-                     */
-
-                    // 0 for unigram, 1 for bigram, 2 for trigram...
-                    int previousWordsLength = (sPreviousWords == null) ? 0 : sPreviousWords.length;
-                    int suggestionLength = suggestions.size();
-
-                    final int COLUMN_BEFORE_ID = 0;
-                    final int COLUMN_AFTER_ID = 1;
-                    final int COLUMN_PICKED_POSITION_ID = 2;
-                    final int COLUMN_SUGGESTION_LENGTH_ID = 3;
-                    final int COLUMN_PREVIOUS_WORDS_COUNT_ID = 4;
-                    final int BASE_COLUMN_SIZE = 5;
-
-                    String[] strings =
-                        new String[BASE_COLUMN_SIZE + suggestionLength * 2 + previousWordsLength];
-                    strings[COLUMN_BEFORE_ID] = before;
-                    strings[COLUMN_AFTER_ID] = after;
-                    strings[COLUMN_PICKED_POSITION_ID] = String.valueOf(position);
-                    strings[COLUMN_SUGGESTION_LENGTH_ID] = String.valueOf(suggestionLength);
-                    strings[COLUMN_PREVIOUS_WORDS_COUNT_ID] = String.valueOf(previousWordsLength);
-
-                    for (int i = 0; i < suggestionLength; ++i) {
-                        String s = suggestions.get(i).toString();
-                        if (sSuggestDicMap.containsKey(s)) {
-                            strings[BASE_COLUMN_SIZE + i] = s;
-                            strings[BASE_COLUMN_SIZE + suggestionLength + i]
-                                    = sSuggestDicMap.get(s).second.toString();
-                        } else {
-                            strings[BASE_COLUMN_SIZE + i] = "";
-                            strings[BASE_COLUMN_SIZE + suggestionLength + i] = "";
-                        }
-                    }
-
-                    for (int i = 0; i < previousWordsLength; ++i) {
-                        strings[BASE_COLUMN_SIZE + suggestionLength * 2 + i] = sPreviousWords[i];
-                    }
-
-                    sLatinImeLogger.sendLogToDropBox(ID_MANUALSUGGESTION_WITH_DATATYPE, strings);
-                }
-            }
-            sSuggestDicMap.clear();
-        }
-    }
+   }
 
     public static void logOnAutoSuggestion(String before, String after) {
-        if (sLogEnabled) {
-            if (!sSuggestDicMap.containsKey(after)) {
-                if (sDBG) {
-                    Log.e(TAG, "logOnAutoSuggestion was cancelled: from unknown dic.");
-                }
-            } else {
-                String separator = String.valueOf(sLatinImeLogger.mRingCharBuffer.getLastChar());
-                sLastAutoSuggestDicTypeId = sSuggestDicMap.get(after).first;
-                sLastAutoSuggestDataType = sSuggestDicMap.get(after).second;
-                sLatinImeLogger.mAutoSuggestCountPerDic[sLastAutoSuggestDicTypeId]++;
-                if (sLastAutoSuggestDicTypeId != Suggest.DIC_MAIN) {
-                    if (sDBG) {
-                        Log.d(TAG, "logOnAutoSuggestion was cancelled: not from main dic.:"
-                                + sLastAutoSuggestDicTypeId);
-                    }
-                    before = "";
-                    after = "";
-                    sPreviousWords = null;
-                }
-                // TODO: Not to send a log if this doesn't come from Main Dictionary.
-                {
-                    if (before.equals(after)) {
-                        before = "";
-                        after = "";
-                    }
-
-                    final int COLUMN_BEFORE_ID = 0;
-                    final int COLUMN_AFTER_ID = 1;
-                    final int COLUMN_SEPARATOR_ID = 2;
-                    final int COLUMN_DATA_TYPE_ID = 3;
-                    final int COLUMN_KEYBOARD_SIZE_WIDTH = 4;
-                    final int COLUMN_KEYBOARD_SIZE_HEIGHT = 5;
-                    final int BASE_COLUMN_SIZE = 6;
-
-                    final int userTypedWordLength = before.length();
-                    final int previousWordsLength = (sPreviousWords == null) ? 0
-                            : sPreviousWords.length;
-                    String[] strings = new String[BASE_COLUMN_SIZE + userTypedWordLength * 2
-                                                  + previousWordsLength];
-                    sLastAutoSuggestXCoordinates = new int[userTypedWordLength];
-                    sLastAutoSuggestXCoordinates = new int[userTypedWordLength];
-
-                    strings[COLUMN_BEFORE_ID] = before;
-                    strings[COLUMN_AFTER_ID] = after;
-                    strings[COLUMN_SEPARATOR_ID] = separator;
-                    strings[COLUMN_DATA_TYPE_ID] = String.valueOf(sLastAutoSuggestDataType);
-                    strings[COLUMN_KEYBOARD_SIZE_WIDTH] = String.valueOf(sKeyboardWidth);
-                    strings[COLUMN_KEYBOARD_SIZE_HEIGHT] = String.valueOf(sKeyboardHeight);
-
-                    for (int i = 0; i < userTypedWordLength; ++i) {
-                        int x = sLatinImeLogger.mRingCharBuffer.getPreviousX(before.charAt(i),
-                                userTypedWordLength - i - 1);
-                        int y = sLatinImeLogger.mRingCharBuffer.getPreviousY(before.charAt(i),
-                                userTypedWordLength - i - 1);
-                        strings[BASE_COLUMN_SIZE + i * 2] = String.valueOf(x);
-                        strings[BASE_COLUMN_SIZE + i * 2 + 1] = String.valueOf(y);
-                        sLastAutoSuggestXCoordinates[i] = x;
-                        sLastAutoSuggestXCoordinates[i] = y;
-                    }
-
-                    for (int i = 0; i < previousWordsLength; ++i) {
-                        strings[BASE_COLUMN_SIZE + userTypedWordLength * 2 + i] = sPreviousWords[i];
-                    }
-
-                    sLatinImeLogger.sendLogToDropBox(ID_AUTOSUGGESTION_WITH_COORDINATES, strings);
-                }
-                synchronized (LatinImeLogger.class) {
-                    sLastAutoSuggestBefore = before;
-                    sLastAutoSuggestAfter = after;
-                    sLastAutoSuggestSeparator = separator;
-                }
-            }
-            sSuggestDicMap.clear();
-        }
     }
 
     public static void logOnAutoSuggestionCanceled() {
-        if (sLogEnabled) {
-            sLatinImeLogger.mAutoCancelledCountPerDic[sLastAutoSuggestDicTypeId]++;
-            if (sLastAutoSuggestBefore != null && sLastAutoSuggestAfter != null) {
-                final int COLUMN_BEFORE_ID = 0;
-                final int COLUMN_AFTER_ID = 1;
-                final int COLUMN_SEPARATOR_ID = 2;
-                final int COLUMN_KEYBOARD_SIZE_WIDTH = 3;
-                final int COLUMN_KEYBOARD_SIZE_HEIGHT = 4;
-                final int BASE_COLUMN_SIZE = 5;
-
-                final int userTypedWordLength = sLastAutoSuggestBefore.length();
-
-                String[] strings = new String[BASE_COLUMN_SIZE + userTypedWordLength * 2];
-                strings[COLUMN_BEFORE_ID] = sLastAutoSuggestBefore;
-                strings[COLUMN_AFTER_ID] = sLastAutoSuggestAfter;
-                strings[COLUMN_SEPARATOR_ID] = sLastAutoSuggestSeparator;
-                strings[COLUMN_KEYBOARD_SIZE_WIDTH] = String.valueOf(sKeyboardWidth);
-                strings[COLUMN_KEYBOARD_SIZE_HEIGHT] = String.valueOf(sKeyboardHeight);
-                for (int i = 0; i < userTypedWordLength; ++i) {
-                    strings[BASE_COLUMN_SIZE + i * 2] = String.valueOf(
-                            sLastAutoSuggestXCoordinates);
-                    strings[BASE_COLUMN_SIZE + i * 2 + 1] = String.valueOf(
-                            sLastAutoSuggestYCoordinates);
-                }
-                sLatinImeLogger.sendLogToDropBox(
-                        ID_AUTOSUGGESTIONCANCELLED_WITH_COORDINATES, strings);
-            }
-            synchronized (LatinImeLogger.class) {
-                sLastAutoSuggestBefore = "";
-                sLastAutoSuggestAfter = "";
-                sLastAutoSuggestSeparator = "";
-            }
-        }
     }
 
     public static void logOnDelete() {
-        if (sLogEnabled) {
-            String mLastWord = sLatinImeLogger.mRingCharBuffer.getLastString();
-            if (!TextUtils.isEmpty(mLastWord)
-                    && mLastWord.equalsIgnoreCase(sLastAutoSuggestBefore)) {
-                logOnAutoSuggestionCanceled();
-            }
-            sLatinImeLogger.mRingCharBuffer.pop();
-            sLatinImeLogger.sendLogToDropBox(ID_DELETE_COUNT, 1);
-        }
     }
 
     public static void logOnInputChar(char c, int x, int y) {
-        if (sLogEnabled) {
-            sLatinImeLogger.mRingCharBuffer.push(c, x, y);
-            sLatinImeLogger.sendLogToDropBox(ID_INPUT_COUNT, 1);
-        }
     }
 
     public static void logOnException(String metaData, Throwable e) {
-        if (sLogEnabled) {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            PrintStream ps = new PrintStream(baos);
-            e.printStackTrace(ps);
-            String exceptionString = URLEncoder.encode(new String(baos.toByteArray(), 0,
-                    Math.min(EXCEPTION_MAX_LENGTH, baos.size())));
-            sLatinImeLogger.sendLogToDropBox(
-                    ID_EXCEPTION, new String[] {metaData, exceptionString});
-            if (sDBG) {
-                Log.e(TAG, "Exception: " + new String(baos.toByteArray())+ ":" + exceptionString);
-            }
-            if (SUPPRESS_EXCEPTION) {
-                sLatinImeLogger.commitInternalAndStopSelf();
-            } else {
-                sLatinImeLogger.commitInternal();
-                if (e instanceof RuntimeException) {
-                    throw (RuntimeException) e;
-                } else if (e instanceof Error) {
-                    throw (Error) e;
-                }
-            }
-        }
     }
 
     public static void logOnWarning(String warning) {
-        if (sLogEnabled) {
-            sLatinImeLogger.sendLogToDropBox(
-                    ID_EXCEPTION, new String[] {warning, ""});
-        }
     }
 
-    // TODO: This code supports only Bigram.
     public static void onStartSuggestion(CharSequence previousWords) {
-        if (sLogEnabled) {
-            sSuggestDicMap.clear();
-            sPreviousWords = new String[] {
-                    (previousWords == null) ? "" : previousWords.toString()};
-        }
     }
 
     public static void onAddSuggestedWord(String word, int typeId, DataType dataType) {
-        if (sLogEnabled) {
-            sSuggestDicMap.put(word, new Pair<Integer, Integer>(typeId, dataType.ordinal()));
-        }
     }
 
     public static void onSetKeyboard(Keyboard kb) {
-        if (sLogEnabled) {
-            sKeyboardWidth = kb.getMinWidth();
-            sKeyboardHeight = kb.getHeight();
-        }
     }
 
-    private static class LogSerializer {
-        private static void appendWithLength(StringBuffer sb, String data) {
-            sb.append(data.length());
-            sb.append(SEPARATER);
-            sb.append(data);
-            sb.append(SEPARATER);
-        }
-
-        private static void appendLogEntry(StringBuffer sb, String time, String tag,
-                String[] data) {
-            if (data.length > 0) {
-                appendWithLength(sb, String.valueOf(data.length + 2));
-                appendWithLength(sb, time);
-                appendWithLength(sb, tag);
-                for (String s: data) {
-                    appendWithLength(sb, s);
-                }
-            }
-        }
-
-        public static String createStringFromEntries(ArrayList<LogEntry> logs) {
-            StringBuffer sb = new StringBuffer();
-            for (LogEntry log: logs) {
-                appendLogEntry(sb, String.valueOf(log.mTime), String.valueOf(log.mTag), log.mData);
-            }
-            return sb.toString();
-        }
-    }
-
-    /* package */ static class RingCharBuffer {
-        final int BUFSIZE = 20;
-        private Context mContext;
-        private int mEnd = 0;
-        /* package */ int mLength = 0;
-        private char[] mCharBuf = new char[BUFSIZE];
-        private int[] mXBuf = new int[BUFSIZE];
-        private int[] mYBuf = new int[BUFSIZE];
-
-        public RingCharBuffer(Context context) {
-            mContext = context;
-        }
-        private int normalize(int in) {
-            int ret = in % BUFSIZE;
-            return ret < 0 ? ret + BUFSIZE : ret;
-        }
-        public void push(char c, int x, int y) {
-            mCharBuf[mEnd] = c;
-            mXBuf[mEnd] = x;
-            mYBuf[mEnd] = y;
-            mEnd = normalize(mEnd + 1);
-            if (mLength < BUFSIZE) {
-                ++mLength;
-            }
-        }
-        public char pop() {
-            if (mLength < 1) {
-                return NULL_CHAR;
-            } else {
-                mEnd = normalize(mEnd - 1);
-                --mLength;
-                return mCharBuf[mEnd];
-            }
-        }
-        public char getLastChar() {
-            if (mLength < 1) {
-                return NULL_CHAR;
-            } else {
-                return mCharBuf[normalize(mEnd - 1)];
-            }
-        }
-        public int getPreviousX(char c, int back) {
-            int index = normalize(mEnd - 2 - back);
-            if (mLength <= back
-                    || Character.toLowerCase(c) != Character.toLowerCase(mCharBuf[index])) {
-                return INVALID_COORDINATE;
-            } else {
-                return mXBuf[index];
-            }
-        }
-        public int getPreviousY(char c, int back) {
-            int index = normalize(mEnd - 2 - back);
-            if (mLength <= back
-                    || Character.toLowerCase(c) != Character.toLowerCase(mCharBuf[index])) {
-                return INVALID_COORDINATE;
-            } else {
-                return mYBuf[index];
-            }
-        }
-        public String getLastString() {
-            StringBuffer sb = new StringBuffer();
-            for (int i = 0; i < mLength; ++i) {
-                char c = mCharBuf[normalize(mEnd - 1 - i)];
-                if (!((LatinIME)mContext).isWordSeparator(c)) {
-                    sb.append(c);
-                } else {
-                    break;
-                }
-            }
-            return sb.reverse().toString();
-        }
-        public void reset() {
-            mLength = 0;
-        }
-    }
-
-    private static class DebugKeyEnabler {
-        private int mCounter = 0;
-        private long mLastTime = 0;
-        public boolean check() {
-            if (System.currentTimeMillis() - mLastTime > 10 * 1000) {
-                mCounter = 0;
-                mLastTime = System.currentTimeMillis();
-            } else if (++mCounter >= 10) {
-                return true;
-            }
-            return false;
-        }
-    }
 }
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index db4d167..c35a1b0 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -81,7 +81,6 @@
     private int mPrefLetterY;
     private int mPrefDistance;
 
-    private int mExtensionResId;
     // TODO: generalize for any keyboardId
     private boolean mIsBlackSym;
 
@@ -278,14 +277,6 @@
         return mIsAlphaKeyboard;
     }
 
-    public void setExtension(int resId) {
-        mExtensionResId = resId;
-    }
-
-    public int getExtension() {
-        return mExtensionResId;
-    }
-
     public void setBlackFlag(boolean f) {
         mIsBlackSym = f;
         if (f) {
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
index cca0de1..7a99366 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
@@ -16,8 +16,6 @@
 
 package com.android.inputmethod.latin;
 
-import java.util.List;
-
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -27,9 +25,9 @@
 import android.os.Message;
 import android.os.SystemClock;
 import android.util.AttributeSet;
-import android.view.LayoutInflater;
 import android.view.MotionEvent;
-import android.widget.PopupWindow;
+
+import java.util.List;
 
 public class LatinKeyboardView extends LatinKeyboardBaseView {
 
@@ -41,21 +39,11 @@
 
     private Keyboard mPhoneKeyboard;
 
-    /** Whether the extension of this keyboard is visible */
-    private boolean mExtensionVisible;
-    /** The view that is shown as an extension of this keyboard view */
-    private LatinKeyboardView mExtension;
-    /** The popup window that contains the extension of this keyboard */
-    private PopupWindow mExtensionPopup;
-    /** Whether this view is an extension of another keyboard */
-    private boolean mIsExtensionType;
-    private boolean mFirstEvent;
     /** Whether we've started dropping move events because we found a big jump */
     private boolean mDroppingEvents;
     /** 
-     * Whether multi-touch disambiguation needs to be disabled for any reason. There are 2 reasons
-     * for this to happen - (1) if a real multi-touch event has occured and (2) we've opened an 
-     * extension keyboard.
+     * Whether multi-touch disambiguation needs to be disabled if a real multi-touch event has
+     * occured
      */
     private boolean mDisableDisambiguation;
     /** The distance threshold at which we start treating the touch session as a multi-touch */
@@ -63,8 +51,6 @@
     /** The y coordinate of the last row */
     private int mLastRowY;
 
-    private int mExtensionLayoutResId = 0;
-
     public LatinKeyboardView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
@@ -77,10 +63,6 @@
         mPhoneKeyboard = phoneKeyboard;
     }
 
-    public void setExtentionLayoutResId (int id) {
-        mExtensionLayoutResId = id;
-    }
-
     @Override
     public void setKeyboard(Keyboard k) {
         super.setKeyboard(k);
@@ -214,11 +196,10 @@
             invalidate();
         }
 
-        // If an extension keyboard is visible or this is an extension keyboard, don't look
-        // for sudden jumps. Otherwise, if there was a sudden jump, return without processing the
-        // actual motion event.
-        if (!mExtensionVisible && !mIsExtensionType
-                && handleSuddenJump(me)) return true;
+        // If there was a sudden jump, return without processing the actual motion event.
+        if (handleSuddenJump(me))
+            return true;
+
         // Reset any bounding box controls in the keyboard
         if (me.getAction() == MotionEvent.ACTION_DOWN) {
             keyboard.keyReleased();
@@ -236,154 +217,7 @@
             }
         }
 
-        // If we don't have an extension keyboard, don't go any further.
-        if (keyboard.getExtension() == 0) {
-            return super.onTouchEvent(me);
-        }
-        // If the motion event is above the keyboard and it's not an UP event coming
-        // even before the first MOVE event into the extension area
-        if (me.getY() < 0 && (mExtensionVisible || me.getAction() != MotionEvent.ACTION_UP)) {
-            if (mExtensionVisible) {
-                int action = me.getAction();
-                if (mFirstEvent) action = MotionEvent.ACTION_DOWN;
-                mFirstEvent = false;
-                MotionEvent translated = MotionEvent.obtain(me.getEventTime(), me.getEventTime(),
-                        action,
-                        me.getX(), me.getY() + mExtension.getHeight(), me.getMetaState());
-                boolean result = mExtension.onTouchEvent(translated);
-                translated.recycle();
-                if (me.getAction() == MotionEvent.ACTION_UP
-                        || me.getAction() == MotionEvent.ACTION_CANCEL) {
-                    closeExtension();
-                }
-                return result;
-            } else {
-                if (openExtension()) {
-                    MotionEvent cancel = MotionEvent.obtain(me.getDownTime(), me.getEventTime(),
-                            MotionEvent.ACTION_CANCEL, me.getX() - 100, me.getY() - 100, 0);
-                    super.onTouchEvent(cancel);
-                    cancel.recycle();
-                    if (mExtension.getHeight() > 0) {
-                        MotionEvent translated = MotionEvent.obtain(me.getEventTime(),
-                                me.getEventTime(),
-                                MotionEvent.ACTION_DOWN,
-                                me.getX(), me.getY() + mExtension.getHeight(),
-                                me.getMetaState());
-                        mExtension.onTouchEvent(translated);
-                        translated.recycle();
-                    } else {
-                        mFirstEvent = true;
-                    }
-                    // Stop processing multi-touch errors
-                    mDisableDisambiguation  = true;
-                }
-                return true;
-            }
-        } else if (mExtensionVisible) {
-            closeExtension();
-            // Send a down event into the main keyboard first
-            MotionEvent down = MotionEvent.obtain(me.getEventTime(), me.getEventTime(),
-                    MotionEvent.ACTION_DOWN,
-                    me.getX(), me.getY(), me.getMetaState());
-            super.onTouchEvent(down);
-            down.recycle();
-            // Send the actual event
-            return super.onTouchEvent(me);
-        } else {
-            return super.onTouchEvent(me);
-        }
-    }
-
-    private void setExtensionType(boolean isExtensionType) {
-        mIsExtensionType = isExtensionType;
-    }
-
-    private boolean openExtension() {
-        // If the current keyboard is not visible, don't show the popup
-        if (!isShown()) {
-            return false;
-        }
-        if (((LatinKeyboard) getKeyboard()).getExtension() == 0) return false;
-        makePopupWindow();
-        mExtensionVisible = true;
-        return true;
-    }
-
-    private void makePopupWindow() {
-        if (mExtensionPopup == null) {
-            int[] windowLocation = new int[2];
-            mExtensionPopup = new PopupWindow(getContext());
-            mExtensionPopup.setBackgroundDrawable(null);
-            LayoutInflater li = (LayoutInflater) getContext().getSystemService(
-                    Context.LAYOUT_INFLATER_SERVICE);
-            mExtension = (LatinKeyboardView) li.inflate(mExtensionLayoutResId == 0 ?
-                    R.layout.input_trans : mExtensionLayoutResId, null);
-            mExtension.setExtensionType(true);
-            mExtension.setOnKeyboardActionListener(
-                    new ExtensionKeyboardListener(getOnKeyboardActionListener()));
-            mExtension.setPopupParent(this);
-            mExtension.setPopupOffset(0, -windowLocation[1]);
-            Keyboard keyboard;
-            mExtension.setKeyboard(keyboard = new LatinKeyboard(getContext(),
-                    ((LatinKeyboard) getKeyboard()).getExtension()));
-            mExtensionPopup.setContentView(mExtension);
-            mExtensionPopup.setWidth(getWidth());
-            mExtensionPopup.setHeight(keyboard.getHeight());
-            mExtensionPopup.setAnimationStyle(-1);
-            getLocationInWindow(windowLocation);
-            // TODO: Fix the "- 30". 
-            mExtension.setPopupOffset(0, -windowLocation[1] - 30);
-            mExtensionPopup.showAtLocation(this, 0, 0, -keyboard.getHeight()
-                    + windowLocation[1]);
-        } else {
-            mExtension.setVisibility(VISIBLE);
-        }
-    }
-
-    @Override
-    public void closing() {
-        super.closing();
-        if (mExtensionPopup != null && mExtensionPopup.isShowing()) {
-            mExtensionPopup.dismiss();
-            mExtensionPopup = null;
-        }
-    }
-
-    private void closeExtension() {
-        mExtension.closing();
-        mExtension.setVisibility(INVISIBLE);
-        mExtensionVisible = false;
-    }
-
-    private static class ExtensionKeyboardListener implements OnKeyboardActionListener {
-        private OnKeyboardActionListener mTarget;
-        ExtensionKeyboardListener(OnKeyboardActionListener target) {
-            mTarget = target;
-        }
-        public void onKey(int primaryCode, int[] keyCodes, int x, int y) {
-            mTarget.onKey(primaryCode, keyCodes, x, y);
-        }
-        public void onPress(int primaryCode) {
-            mTarget.onPress(primaryCode);
-        }
-        public void onRelease(int primaryCode) {
-            mTarget.onRelease(primaryCode);
-        }
-        public void onText(CharSequence text) {
-            mTarget.onText(text);
-        }
-        public void swipeDown() {
-            // Don't pass through
-        }
-        public void swipeLeft() {
-            // Don't pass through
-        }
-        public void swipeRight() {
-            // Don't pass through
-        }
-        public void swipeUp() {
-            // Don't pass through
-        }
+        return super.onTouchEvent(me);
     }
 
     /****************************  INSTRUMENTATION  *******************************/