diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png
deleted file mode 100644
index 3e25180f085f4546ca6464ce2e9ceb52512dd7e5..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
deleted file mode 100644
index bad360f77321cfdcaa83f8d048c042293d4aee7f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
deleted file mode 100644
index 49f519860b94a20a0b221bbcd24b6a272a9a7579..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
deleted file mode 100644
index e784eddf8985c46388b443a876e47271223010cb..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
deleted file mode 100644
index a4731cf1ac85aa84e821a7b5656fabae84b55f0b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
deleted file mode 100644
index 03e163c9cd60f56a6272e1cec0cca1d3072e6eea..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/ic_subtype_mic_dark.png b/java/res/drawable-hdpi/ic_subtype_mic_dark.png
deleted file mode 100644
index eacbcd255cd735dc1d482709c39099aeadff1aad..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/ic_subtype_mic_dark.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal.9.png
deleted file mode 100644
index 12bc97928b4dc45f26e5f056ab56ef2924790116..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png
deleted file mode 100644
index 44bd414a1afce676289e43ba523dd856a04a4a04..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png
deleted file mode 100644
index 43fdf5b885a8c851d3cbc24b1382c0fc34b329d0..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png
deleted file mode 100644
index 1c1f3d711e109122c0b694160302e1fcf04ef7f9..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png
deleted file mode 100644
index dacb675a99c93e2765ee8f15e41f5f9777391c9e..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png
deleted file mode 100644
index 3daa69f314a0f6d00fed463207e9497f704b670c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_mic_holo_light.png b/java/res/drawable-mdpi/sym_keyboard_mic_holo_light.png
deleted file mode 100644
index 84a63dc7f3086d94a648e02662b2e18b6e2a0da9..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_mic_holo_light.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal.9.png
deleted file mode 100644
index 026005d6f4eb8104a851befaf1973b535b3d41f5..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png
deleted file mode 100644
index 38c5f244b4f1b61a33b770a82ab91b7b517384a8..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png
deleted file mode 100644
index f1223e50e4ea7a48ea1df720b3195c43cab624f7..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png
deleted file mode 100644
index ec35db54d60567fe63f48c54a6453c98dbe6d721..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png
deleted file mode 100644
index bd30464d67e2af9e2d980dd5b12c49913aee1785..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png
deleted file mode 100644
index a3ff5d1bb6fa451cf6d5a32258c74c3f427bcba1..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/ic_subtype_mic_dark.png b/java/res/drawable-xhdpi/ic_subtype_mic_dark.png
deleted file mode 100644
index 17581ba89220a50a10c95b94bc9cc80600cf616a..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/ic_subtype_mic_dark.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/ic_subtype_mic_dark.png b/java/res/drawable-xxhdpi/ic_subtype_mic_dark.png
deleted file mode 100644
index 811103a56a73d2424cc220025edc70a40e3af0ad..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xxhdpi/ic_subtype_mic_dark.png and /dev/null differ
diff --git a/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml b/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
index bc7928d6ad325e434ff6054d19ecca3f66ecea0f..adc3e35a97d53da5855734713e8f3bc6c1fb1312 100644
--- a/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
+++ b/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">38sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
- <dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">20sp</dimen>
diff --git a/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml b/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
index aebf6d2f3f6ee9dd1d6c9fc7acef9b969539d1ce..1ff43ff9f50c987aecf761ca1d39fb3b6b6e11af 100644
--- a/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
+++ b/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">22sp</dimen>
<dimen name="setup_step_bullet_text_size">22sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
- <dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">20sp</dimen>
<dimen name="setup_step_instruction_text_size">16sp</dimen>
<dimen name="setup_step_action_text_size">18sp</dimen>
diff --git a/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml b/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
index aedf79fb2a917b25429805e3f0f73211b6d1b683..a0e30cd379fb278ff90783fd887e7c5187942081 100644
--- a/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
+++ b/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">32sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
- <dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">20sp</dimen>
diff --git a/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml b/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
index 6d66f46ebe54e85eed1f516c394272aabe5091c2..cf2a10a9e90b18afc92362f74c5a4c77b556e14d 100644
--- a/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
+++ b/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">26sp</dimen>
<dimen name="setup_step_bullet_text_size">22sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
- <dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">20sp</dimen>
<dimen name="setup_step_instruction_text_size">16sp</dimen>
<dimen name="setup_step_action_text_size">18sp</dimen>
diff --git a/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml b/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
index e22b741fb86425e63ffccab43f11ee832aa2bf4c..a782ef8f40ed06639c8e344848e39e2a3fab0ce4 100644
--- a/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
+++ b/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">38sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
- <dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">20sp</dimen>
diff --git a/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml b/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
index 86cf3a04af24371ec25966838a4e3dbb0e1bc10c..9ac0f115f27d486b1830a0875c1bf42f2ec69315 100644
--- a/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
+++ b/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">36sp</dimen>
<dimen name="setup_step_bullet_text_size">24sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
- <dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">24sp</dimen>
<dimen name="setup_step_instruction_text_size">18sp</dimen>
<dimen name="setup_step_action_text_size">20sp</dimen>
diff --git a/java/res/values-land/setup-dimens-small-phone-land.xml b/java/res/values-land/setup-dimens-small-phone-land.xml
index 088e6562a14e138798e507ee075e381e2403cf59..de93eee08c00a3b6dda36fd57bddf735da1b35a1 100644
--- a/java/res/values-land/setup-dimens-small-phone-land.xml
+++ b/java/res/values-land/setup-dimens-small-phone-land.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">18sp</dimen>
<dimen name="setup_step_bullet_text_size">18sp</dimen>
<dimen name="setup_step_triangle_indicator_height">18dp</dimen>
- <dimen name="setup_step_indicator_height">18dp</dimen>
<dimen name="setup_step_title_text_size">18sp</dimen>
<dimen name="setup_step_instruction_text_size">14sp</dimen>
<dimen name="setup_step_action_text_size">16sp</dimen>
diff --git a/java/res/values-port/setup-dimens-small-phone-port.xml b/java/res/values-port/setup-dimens-small-phone-port.xml
index 8ac72ea7cca1717ae9e51a296f75062cacd6ad7b..cf2751f1b2af0ad7ff9fbdb42a14dadda27450d2 100644
--- a/java/res/values-port/setup-dimens-small-phone-port.xml
+++ b/java/res/values-port/setup-dimens-small-phone-port.xml
@@ -20,7 +20,6 @@
<dimen name="setup_welcome_description_text_size">20sp</dimen>
<dimen name="setup_step_bullet_text_size">18sp</dimen>
<dimen name="setup_step_triangle_indicator_height">18dp</dimen>
- <dimen name="setup_step_indicator_height">18dp</dimen>
<dimen name="setup_step_title_text_size">18sp</dimen>
<dimen name="setup_step_instruction_text_size">14sp</dimen>
<dimen name="setup_step_action_text_size">16sp</dimen>
diff --git a/java/res/values-sw540dp/config.xml b/java/res/values-sw540dp/config.xml
index b1e578366be8440c87e9fe2d229f822f842f5187..f1d6505cb67fd27d95689658358e9c3cd5f651a9 100644
--- a/java/res/values-sw540dp/config.xml
+++ b/java/res/values-sw540dp/config.xml
@@ -23,9 +23,6 @@
<!-- Whether or not Popup on key press is enabled by default -->
<bool name="config_default_key_preview_popup">false</bool>
<bool name="config_default_sound_enabled">true</bool>
- <bool name="config_auto_correction_spacebar_led_enabled">false</bool>
- <!-- The language is never displayed if == 0, always displayed if < 0 -->
- <integer name="config_delay_before_fadeout_language_on_spacebar">1200</integer>
<integer name="config_max_more_keys_column">5</integer>
<!--
Configuration for MainKeyboardView
diff --git a/java/res/values-sw540dp/dimens.xml b/java/res/values-sw540dp/dimens.xml
index 801b7acb59b5758cda285b62868736fcf024459b..3fbdbe882fa7248d12b85f4623a0afba67bd9375 100644
--- a/java/res/values-sw540dp/dimens.xml
+++ b/java/res/values-sw540dp/dimens.xml
@@ -80,8 +80,6 @@
<dimen name="suggestion_text_size">22dp</dimen>
<dimen name="more_suggestions_hint_text_size">33dp</dimen>
- <!-- Gesture trail parameters -->
- <dimen name="gesture_trail_width">2.5dp</dimen>
<!-- Gesture floating preview text parameters -->
<dimen name="gesture_floating_preview_text_size">28dp</dimen>
<dimen name="gesture_floating_preview_text_offset">87dp</dimen>
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml
index a3f5de95b43cd1a024cad57d89d4aea15141e8c6..4d3f29defac28a2206d05483e98b26bda73b37af 100644
--- a/java/res/values-sw768dp/config.xml
+++ b/java/res/values-sw768dp/config.xml
@@ -24,7 +24,6 @@
<!-- Whether or not Popup on key press is enabled by default -->
<bool name="config_default_key_preview_popup">false</bool>
<bool name="config_default_sound_enabled">true</bool>
- <bool name="config_auto_correction_spacebar_led_enabled">false</bool>
<integer name="config_max_more_keys_column">5</integer>
<!--
Configuration for MainKeyboardView
diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml
index 4671aa28b6a0be6ddce6cbb06444565a89041731..f0d53e75c7d4f1770e1f14b0f2322c052706ebba 100644
--- a/java/res/values-sw768dp/dimens.xml
+++ b/java/res/values-sw768dp/dimens.xml
@@ -80,8 +80,6 @@
<dimen name="suggestion_text_size">22dp</dimen>
<dimen name="more_suggestions_hint_text_size">33dp</dimen>
- <!-- Gesture trail parameters -->
- <dimen name="gesture_trail_width">2.5dp</dimen>
<!-- Gesture floating preview text parameters -->
<dimen name="gesture_floating_preview_text_size">26dp</dimen>
<dimen name="gesture_floating_preview_text_offset">86dp</dimen>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 669a6612cd8164e94267c22a0ba6d4c35653428a..3b989ee103bee1cbec376a4724af248537d5c3e8 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -22,8 +22,6 @@
<bool name="config_use_fullscreen_mode">false</bool>
<bool name="config_enable_show_voice_key_option">true</bool>
<bool name="config_enable_show_option_of_key_preview_popup">true</bool>
- <!-- TODO: Disable the following configuration for production. -->
- <bool name="config_enable_usability_study_mode_option">true</bool>
<!-- Whether or not Popup on key press is enabled by default -->
<bool name="config_default_key_preview_popup">true</bool>
<!-- Default value for next word prediction: after entering a word and a space only, should we look
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 4588b10eb01d2e86acda521d49b245a028733afa..94554aebbaa3b85be8c8c0916d37d8cbbed08af3 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -80,7 +80,6 @@
<dimen name="more_suggestions_row_height">40dp</dimen>
<dimen name="more_suggestions_bottom_gap">6dp</dimen>
<dimen name="more_suggestions_modal_tolerance">32.0dp</dimen>
- <dimen name="more_suggestions_slide_allowance">16.0dp</dimen>
<integer name="max_more_suggestions_row">6</integer>
<fraction name="min_more_suggestions_width">90%</fraction>
<fraction name="more_suggestions_info_ratio">18%</fraction>
diff --git a/java/res/xml/key_symbols_period.xml b/java/res/xml/key_symbols_period.xml
deleted file mode 100644
index 6efc9dee3b54cb2cb39ee3efbad1bfc172c9ba6c..0000000000000000000000000000000000000000
--- a/java/res/xml/key_symbols_period.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <!-- U+2105: "â„…" CARE OF
- U+2122: "â„¢" TRADE MARK SIGN
- U+00AE: "®" REGISTERED SIGN
- U+00A9: "©" COPYRIGHT SIGN
- U+00A7: "§" SECTION SIGN
- U+00B6: "¶" PILCROW SIGN
- U+002C: "," COMMA
- U+2022: "•" BULLET -->
- <!-- U+00B0: "°" DEGREE SIGN
- U+2032: "′" PRIME
- U+2033: "″" DOUBLE PRIME
- U+2191: "↑" UPWARDS ARROW
- U+2193: "↓" DOWNWARDS ARROW
- U+2190: "â†" LEFTWARDS ARROW
- U+2192: "→" RIGHTWARDS ARROW
- U+2026: "…" HORIZONTAL ELLIPSIS -->
- <!-- U+0394: "Δ" GREEK CAPITAL LETTER DELTA
- U+03A0: "Î " GREEK CAPITAL LETTER PI
- U+03C0: "Ï€" GREEK SMALL LETTER PI -->
- <Key
- latin:keyLabel="."
- latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!fixedColumnOrder!8,℅,™,®,©,§,¶,\\,,•,°,′,″,↑,↓,←,→,…,!text/more_keys_for_bullet,Δ,Π,π" />
-</merge>