diff --git a/java/res/values-xlarge/bools.xml b/java/res/values-xlarge/bools.xml
deleted file mode 100644
index fe8fc5838..000000000
--- a/java/res/values-xlarge/bools.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-<resources>
-    <!-- Whether or not Popup on key press is enabled by default -->
-    <bool name="default_popup_preview">false</bool>
-</resources>
diff --git a/java/res/values-xlarge/dimens.xml b/java/res/values-xlarge/dimens.xml
deleted file mode 100644
index 4e1c52877..000000000
--- a/java/res/values-xlarge/dimens.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-
-<resources>
-    <dimen name="key_height">72dip</dimen>
-    <dimen name="candidate_strip_height">46dip</dimen>
-    <dimen name="spacebar_vertical_correction">0dip</dimen>
-    <dimen name="key_text_size">35sp</dimen>
-</resources>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index fab4bd72b..e5654e96d 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -20,114 +20,7 @@
 <!-- The attributes in this XML file provide configuration information -->
 <!-- for the Input Method Manager. -->
 
-<!-- cs, da, de, en, es, fr, it, iw, nb, nl, ru, sr, sv -->
-<!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
-<!-- TODO: use <lang>_mic icon instead of a common mic icon. -->
 <input-method xmlns:android="http://schemas.android.com/apk/res/android"
         android:settingsActivity="com.android.inputmethod.latin.LatinIMESettings"
-        android:isDefault="@bool/im_is_default">
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:imeSubtypeLocale="cs"
-            android:imeSubtypeMode="@string/subtype_mode_keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:imeSubtypeLocale="da"
-            android:imeSubtypeMode="@string/subtype_mode_keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:imeSubtypeLocale="de"
-            android:imeSubtypeMode="@string/subtype_mode_keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:imeSubtypeLocale="en"
-            android:imeSubtypeMode="@string/subtype_mode_keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:imeSubtypeLocale="es"
-            android:imeSubtypeMode="@string/subtype_mode_keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:imeSubtypeLocale="fr"
-            android:imeSubtypeMode="@string/subtype_mode_keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:imeSubtypeLocale="it"
-            android:imeSubtypeMode="@string/subtype_mode_keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:imeSubtypeLocale="iw"
-            android:imeSubtypeMode="@string/subtype_mode_keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:imeSubtypeLocale="nb"
-            android:imeSubtypeMode="@string/subtype_mode_keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:imeSubtypeLocale="nl"
-            android:imeSubtypeMode="@string/subtype_mode_keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:imeSubtypeLocale="ru"
-            android:imeSubtypeMode="@string/subtype_mode_keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:imeSubtypeLocale="sr"
-            android:imeSubtypeMode="@string/subtype_mode_keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:imeSubtypeLocale="sv"
-            android:imeSubtypeMode="@string/subtype_mode_keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:imeSubtypeLocale="cs"
-            android:imeSubtypeMode="@string/subtype_mode_voice"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:imeSubtypeLocale="da"
-            android:imeSubtypeMode="@string/subtype_mode_voice"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:imeSubtypeLocale="de"
-            android:imeSubtypeMode="@string/subtype_mode_voice"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:imeSubtypeLocale="en"
-            android:imeSubtypeMode="@string/subtype_mode_voice"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:imeSubtypeLocale="es"
-            android:imeSubtypeMode="@string/subtype_mode_voice"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:imeSubtypeLocale="fr"
-            android:imeSubtypeMode="@string/subtype_mode_voice"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:imeSubtypeLocale="it"
-            android:imeSubtypeMode="@string/subtype_mode_voice"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:imeSubtypeLocale="iw"
-            android:imeSubtypeMode="@string/subtype_mode_voice"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:imeSubtypeLocale="nb"
-            android:imeSubtypeMode="@string/subtype_mode_voice"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:imeSubtypeLocale="nl"
-            android:imeSubtypeMode="@string/subtype_mode_voice"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:imeSubtypeLocale="ru"
-            android:imeSubtypeMode="@string/subtype_mode_voice"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:imeSubtypeLocale="sr"
-            android:imeSubtypeMode="@string/subtype_mode_voice"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:imeSubtypeLocale="sv"
-            android:imeSubtypeMode="@string/subtype_mode_voice"
-    />
-</input-method>
+        android:isDefault="@bool/im_is_default"
+/>