diff --git a/res/menu/pick.xml b/res/menu/pick.xml
deleted file mode 100644
index 5302dd9..0000000
--- a/res/menu/pick.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/menu_display_selected"
-        android:icon="@drawable/ic_menu_display_selected"
-        android:title="@string/menu_display_selected" />
-
-    <item
-        android:id="@+id/menu_display_all"
-        android:icon="@drawable/ic_menu_display_all"
-        android:title="@string/menu_display_all" />
-
-    <item
-        android:id="@+id/menu_select_all"
-        android:icon="@drawable/ic_menu_select"
-        android:title="@string/menu_select_all" />
-
-    <item
-        android:id="@+id/menu_select_none"
-        android:icon="@drawable/ic_menu_unselect"
-        android:title="@string/menu_select_none" />
-
-</menu>
diff --git a/res/menu/search.xml b/res/menu/search.xml
deleted file mode 100644
index 4e2e8e3..0000000
--- a/res/menu/search.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/menu_search"
-        android:icon="@android:drawable/ic_menu_search"
-        android:title="@string/menu_search" />
-
-</menu>
diff --git a/res/values-sw580dp-w1000dp/dimens.xml b/res/values-sw580dp-w1000dp/dimens.xml
index fe03b0d..7329930 100644
--- a/res/values-sw580dp-w1000dp/dimens.xml
+++ b/res/values-sw580dp-w1000dp/dimens.xml
@@ -14,13 +14,6 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="action_bar_filter_min_width">220dip</dimen>
-    <dimen name="action_bar_filter_max_width">300dip</dimen>
-    <dimen name="action_bar_search_max_width">336dip</dimen>
-    <dimen name="action_bar_search_spacing">32dip</dimen>
     <dimen name="group_detail_border_padding">32dip</dimen>
-    <dimen name="detail_header_view_margin">16dip</dimen>
-    <dimen name="detail_header_attribution_height">56dip</dimen>
-    <dimen name="detail_update_section_top_padding">48dip</dimen>
     <dimen name="contact_detail_list_top_padding">32dip</dimen>
 </resources>
diff --git a/res/values-sw580dp-w720dp/dimens.xml b/res/values-sw580dp-w720dp/dimens.xml
index 399c26c..a69c20a 100644
--- a/res/values-sw580dp-w720dp/dimens.xml
+++ b/res/values-sw580dp-w720dp/dimens.xml
@@ -17,8 +17,4 @@
     <dimen name="editor_type_label_width">180dip</dimen>
     <dimen name="editor_round_button_padding_left">8dip</dimen>
     <dimen name="editor_round_button_padding_right">8dip</dimen>
-    <dimen name="editor_name_text_field_left_margin">52dip</dimen>
-    <dimen name="editor_title_label_width">150dip</dimen>
-    <dimen name="editor_interpolator_narrow_width">800dip</dimen>
-    <dimen name="editor_name_text_field_right_margin">10dip</dimen>
 </resources>
diff --git a/res/values-sw580dp-w720dp/styles.xml b/res/values-sw580dp-w720dp/styles.xml
index 151b173..eadb88c 100644
--- a/res/values-sw580dp-w720dp/styles.xml
+++ b/res/values-sw580dp-w720dp/styles.xml
@@ -52,11 +52,4 @@
         <!-- Favorites -->
         <item name="favorites_padding_bottom">0dip</item>
     </style>
-
-    <style name="ContactDetailHeaderTextView">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-    </style>
 </resources>
diff --git a/res/values-sw580dp/dimens.xml b/res/values-sw580dp/dimens.xml
index 551a930..3824248 100644
--- a/res/values-sw580dp/dimens.xml
+++ b/res/values-sw580dp/dimens.xml
@@ -16,33 +16,23 @@
 <resources>
     <dimen name="editor_padding_top">32dip</dimen>
     <dimen name="editor_type_label_width">122dip</dimen>
-    <dimen name="editor_field_spinner_text_size">15sp</dimen>
     <dimen name="editor_round_button_padding_left">16dip</dimen>
     <dimen name="editor_round_button_padding_right">16dip</dimen>
-    <dimen name="editor_kind_title_left_padding">16dip</dimen>
     <dimen name="editor_add_field_label_left_padding">24dip</dimen>
     <dimen name="detail_item_side_margin">0dip</dimen>
     <dimen name="detail_item_vertical_margin">16dip</dimen>
     <dimen name="detail_item_icon_margin">8dip</dimen>
-    <dimen name="contact_name_text_size">26sp</dimen>
-    <dimen name="action_bar_filter_min_width">120dip</dimen>
-    <dimen name="action_bar_filter_max_width">120dip</dimen>
-    <dimen name="action_bar_search_max_width">300dip</dimen>
-    <dimen name="action_bar_search_spacing">12dip</dimen>
     <dimen name="shortcut_icon_size">64dip</dimen>
     <dimen name="list_section_height">37dip</dimen>
     <dimen name="group_detail_border_padding">16dip</dimen>
     <dimen name="detail_update_section_side_padding">0dip</dimen>
     <dimen name="detail_update_section_item_horizontal_padding">8dip</dimen>
     <dimen name="detail_update_section_item_vertical_padding">16dip</dimen>
-    <dimen name="detail_update_section_between_items_vertical_padding">16dip</dimen>
-    <dimen name="detail_update_section_item_last_row_extra_vertical_padding">8dip</dimen>
     <dimen name="search_view_width">400dip</dimen>
     <!-- Center vertically -->
     <dimen name="quick_contact_top_position">-1px</dimen>
     <!-- Contact list (vertical scroll bar comes left) -->
     <dimen name="directory_header_height">24dip</dimen>
-    <dimen name="contacts_count_right_margin">24dip</dimen>
     <dimen name="contact_browser_list_top_margin">16dip</dimen>
     <dimen name="contact_browser_list_header_left_margin">@dimen/list_visible_scrollbar_padding</dimen>
     <dimen name="contact_browser_list_header_right_margin">24dip</dimen>
diff --git a/res/values-sw580dp/styles.xml b/res/values-sw580dp/styles.xml
index 33bb632..c60afca 100644
--- a/res/values-sw580dp/styles.xml
+++ b/res/values-sw580dp/styles.xml
@@ -98,7 +98,7 @@
         <item name="android:layout_height">400dip</item>
     </style>
 
-    <style name="ContactDetailActivityTheme" parent="@android:Theme.Dialog">
+    <style name="DetailActivityTheme" parent="@android:Theme.Dialog">
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 1a8ee23..f224832 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -21,41 +21,14 @@
     <color name="quickcontact_list_background">#ffe2e2e2</color>
     <color name="quickcontact_tab_indicator">#ff33b5e6</color>
 
-    <color name="edit_divider">#ff666666</color>
-
     <!-- Color of the background of the contact detail and editor pages -->
     <color name="background_primary">#FFFFFF</color>
 
-    <color name="background_secondary">#ff202020</color>
-
-    <color name="translucent_search_background">#cc000000</color>
-
     <color name="background_social_updates">#ffeeeeee</color>
 
     <!-- Color used for the letter in the A-Z section header -->
     <color name="section_header_text_color">#ff999999</color>
 
-    <!-- Color used as a selected background for the account/group selection widget -->
-    <color name="filter_selector_selected_background">#66ffffff</color>
-
-    <!-- Color used for the label (type) in the editor -->
-    <color name="editor_label_text_color">#FF7F7F7F</color>
-
-    <!-- Color of the line above the contact photo in the contact detail header -->
-    <color name="contact_detail_header_divider_color">#FF999999</color>
-
-    <!-- Color of the title text and divider for the kind type on the contact detail page -->
-    <color name="detail_kind_title_color">#63B8FF</color>
-
-    <!-- Color of the text indicating the type of entry (e.g. Home, Work etc) -->
-    <color name="detail_item_type_color">#B4B4B4</color>
-
-    <!-- Color of the text indicating the type of entry (e.g. Home, Work etc) -->
-    <color name="detail_header_view_text_color">#FFFFFF</color>
-
-    <!-- Color of the background of the tabs on the contact detail page -->
-    <color name="detail_tab_background">#DBDBDB</color>
-
     <!-- Color of the text in the updates tab in the tab carousel on the contact detail page -->
     <color name="detail_update_tab_text_color">#777777</color>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f0ba3d5..87ff84b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -14,13 +14,6 @@
      limitations under the License.
 -->
 <resources>
-    <!-- The height of the ScrollingTabWidget -->
-    <dimen name="tab_height">40dip</dimen>
-    <dimen name="account_name_height">25dip</dimen>
-
-    <dimen name="contact_shortcut_frame_width">50dip</dimen>
-    <dimen name="contact_shortcut_frame_height">56dip</dimen>
-
     <dimen name="account_selector_popup_width">400dip</dimen>
 
     <dimen name="photo_action_popup_width">400dip</dimen>
@@ -38,9 +31,6 @@
     <dimen name="editor_round_button_padding_top">8dip</dimen>
     <dimen name="editor_round_button_padding_bottom">8dip</dimen>
 
-    <!-- Left padding of the kind title in the contact editor -->
-    <dimen name="editor_kind_title_left_padding">8dip</dimen>
-
     <!-- Left padding of the label in the add field button for the contact editor -->
     <dimen name="editor_add_field_label_left_padding">16dip</dimen>
 
@@ -56,72 +46,27 @@
     <!-- Minimum height of a row in the Editor -->
     <dimen name="editor_min_line_item_height">48dip</dimen>
 
-    <!-- Font size used for the value of a field in the contact editor. -->
-    <dimen name="editor_field_text_size">18sp</dimen>
-
-    <!-- Font size used for the title of a field in the contact editor. -->
-    <dimen name="editor_field_title_text_size">15sp</dimen>
-
-    <!-- Font size for the entries in a spinner in the contact editor. -->
-    <dimen name="editor_field_spinner_text_size">10sp</dimen>
-
-    <!-- Left margin of the name text input fields and the photo in the contact editor -->
-    <dimen name="editor_name_text_field_left_margin">25dip</dimen>
-
-    <!-- Right margin of the text input fields in the contact editor -->
-    <dimen name="editor_name_text_field_right_margin">0dip</dimen>
-
-    <!-- Width of the title labels in the contact editor -->
-    <dimen name="editor_title_label_width">120dip</dimen>
-
-    <!-- Height of the attribution text view in the contact detail header view -->
-    <dimen name="detail_header_attribution_height">40dip</dimen>
-
-    <!-- Margin between the photo, the star, and text in the contact detail header view -->
-    <dimen name="detail_header_view_margin">8dip</dimen>
-
     <!-- Height of the tab text label in the tab carousel on the contact detail page -->
     <dimen name="detail_tab_carousel_tab_label_height">45dip</dimen>
 
     <!-- Height of the tab text label in the tab carousel on the contact detail page -->
     <dimen name="detail_tab_carousel_tab_label_indent">24dip</dimen>
 
-    <!-- Width of one fragment in the fragment carousel on the contact detail page -->
-    <dimen name="detail_fragment_carousel_fragment_width">420dip</dimen>
-
-    <!-- Vertical margin of the text within the update tab in the tab carousel -->
-    <dimen name="detail_update_tab_vertical_margin">32dip</dimen>
-
     <!-- Left and right padding of the text within the update tab in the tab carousel -->
     <dimen name="detail_update_tab_side_padding">24dip</dimen>
 
-    <!-- Top padding of the update section in the contact detail card -->
-    <dimen name="detail_update_section_top_padding">8dip</dimen>
-
     <!-- Left and right padding of the update section in the contact detail card -->
     <dimen name="detail_update_section_side_padding">16dip</dimen>
 
     <!-- Vertical padding above and below individual stream items -->
     <dimen name="detail_update_section_item_vertical_padding">16dip</dimen>
 
-    <!-- Vertical padding between rows of images in a single stream item -->
-    <dimen name="detail_update_section_between_items_vertical_padding">16dip</dimen>
-
-    <!-- The extra padding to be added at the end of last row in a stream items, i.e., the
-         difference between detail_update_section_item_vertical_padding and
-         detail_update_section_between_items_vertical_padding
-      -->
-    <dimen name="detail_update_section_item_last_row_extra_vertical_padding">0dip</dimen>
-
     <!-- Horizontal padding for individual stream items -->
     <dimen name="detail_update_section_item_horizontal_padding">8dip</dimen>
 
     <!-- Padding between columns images and/or text in a single stream item -->
     <dimen name="detail_update_section_between_items_padding">1dip</dimen>
 
-    <!-- Horizontal padding between content sections within a stream item -->
-    <dimen name="detail_update_section_internal_padding">16dip</dimen>
-
     <!-- Horizontal padding between attribution and comments -->
     <dimen name="detail_update_section_attribution_comments_padding">4dip</dimen>
 
@@ -168,27 +113,12 @@
     <dimen name="widget_snippet_top_padding">3dip</dimen>
     <dimen name="widget_snippet_bottom_padding">6dip</dimen>
 
-    <!-- Minimum width of the filter selector in the action bar -->
-    <dimen name="action_bar_filter_min_width">100dip</dimen>
-
-    <!-- Maximum width of the filter selector in the action bar -->
-    <dimen name="action_bar_filter_max_width">100dip</dimen>
-
-    <!-- Maximum width of the search field in the action bar -->
-    <dimen name="action_bar_search_max_width">100dip</dimen>
-
-    <!-- Spacing on the left the search field in the action bar -->
-    <dimen name="action_bar_search_spacing">12dip</dimen>
-
     <!-- Size of the shortcut icon. 0dip means: use the system default -->
     <dimen name="shortcut_icon_size">0dip</dimen>
 
     <!-- Height of list sections (A, B, C) that show the first character of the contacts -->
     <dimen name="list_section_height">25dip</dimen>
 
-    <!-- Border padding for the group list header for each account -->
-    <dimen name="group_list_header_padding">5dip</dimen>
-
     <!-- Account title left padding -->
     <dimen name="account_container_left_padding">16dip</dimen>
 
@@ -204,15 +134,9 @@
     <!-- Left padding of the auto complete field to line hint text up with member list -->
     <dimen name="group_editor_autocomplete_left_padding">8dip</dimen>
 
-    <!-- Size of group list icons -->
-    <dimen name="group_list_icon_size">32dip</dimen>
-
     <!-- Border padding for the group detail fragment -->
     <dimen name="group_detail_border_padding">32dip</dimen>
 
-    <!-- Height of the member list in the group editor -->
-    <dimen name="group_editor_member_list_height">550dip</dimen>
-
     <!-- Height of edit text in dialpad fragment -->
     <dimen name="dialpad_horizontal_margin">4dip</dimen>
     <dimen name="dialpad_vertical_margin">2dip</dimen>
@@ -232,9 +156,7 @@
     <dimen name="contact_browser_list_header_right_margin">@dimen/list_visible_scrollbar_padding</dimen>
     <dimen name="contact_browser_list_item_photo_size">64dip</dimen>
     <dimen name="contact_browser_list_item_text_indent">8dip</dimen>
-
     <dimen name="contact_browser_list_top_margin">8dip</dimen>
-    <dimen name="contacts_count_right_margin">40dip</dimen>
 
     <!--  ContactTile Layouts -->
     <dimen name="contact_tile_shadowbox_height">48dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0a5352a..3c6694d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -116,15 +116,6 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
-    <style name="ContactsSearchAnimation">
-        <item name="android:windowEnterAnimation">@anim/search_bar_enter</item>
-        <item name="android:windowExitAnimation">@anim/search_bar_exit</item>
-    </style>
-
-    <style name="DummyAnimation">
-        <item name="android:windowExitAnimation">@anim/dummy_animation</item>
-    </style>
-
     <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
         <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
         <item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item>
@@ -223,11 +214,6 @@
         <item name="android:layout_width">match_parent</item>
     </style>
 
-    <style name="ContactDetailHeaderTextView">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-    </style>
-
     <style name="ContactDetailItemType">
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
         <item name="android:textColor">?android:attr/textColorSecondary</item>
@@ -255,16 +241,6 @@
         <item name="android:soundEffectsEnabled">false</item>
     </style>
 
-    <style name="FavoritesFragmentStyle">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">1</item>
-    </style>
-
-    <style name="FrequentFragmentStyle">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">1</item>
-    </style>
-
     <style name="ConfirmAddDetailViewStyle">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>