diff --git a/res/color/tab_indicator_text.xml b/res/color/tab_indicator_text.xml
deleted file mode 100644
index 50ca824..0000000
--- a/res/color/tab_indicator_text.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="@*android:color/dim_foreground_dark_inverse"/>
-    <item android:color="@*android:color/dim_foreground_dark"/> <!-- not selected -->
-</selector>
diff --git a/res/drawable-hdpi/bg_infobar_new.9.png b/res/drawable-hdpi/bg_infobar_new.9.png
deleted file mode 100644
index 104ced9..0000000
--- a/res/drawable-hdpi/bg_infobar_new.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_search_dialog_default.9.png b/res/drawable-hdpi/btn_search_dialog_default.9.png
deleted file mode 100644
index f65fa14..0000000
--- a/res/drawable-hdpi/btn_search_dialog_default.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_search_dialog_pressed.9.png b/res/drawable-hdpi/btn_search_dialog_pressed.9.png
deleted file mode 100644
index 17cc0dd..0000000
--- a/res/drawable-hdpi/btn_search_dialog_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_search_dialog_selected.9.png b/res/drawable-hdpi/btn_search_dialog_selected.9.png
deleted file mode 100644
index 0509e14..0000000
--- a/res/drawable-hdpi/btn_search_dialog_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_aggregated.png b/res/drawable-hdpi/ic_aggregated.png
deleted file mode 100644
index 7ca15b1..0000000
--- a/res/drawable-hdpi/ic_aggregated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_dial_number_blk.png b/res/drawable-hdpi/ic_dial_number_blk.png
deleted file mode 100755
index 971d60a..0000000
--- a/res/drawable-hdpi/ic_dial_number_blk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_dial_number_wht.png b/res/drawable-hdpi/ic_dial_number_wht.png
deleted file mode 100755
index ffc0048..0000000
--- a/res/drawable-hdpi/ic_dial_number_wht.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_selected_friends_list.png b/res/drawable-hdpi/ic_tab_selected_friends_list.png
deleted file mode 100755
index 201b80f..0000000
--- a/res/drawable-hdpi/ic_tab_selected_friends_list.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_unselected_friends_list.png b/res/drawable-hdpi/ic_tab_unselected_friends_list.png
deleted file mode 100755
index 6a31485..0000000
--- a/res/drawable-hdpi/ic_tab_unselected_friends_list.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/bg_infobar_new.9.png b/res/drawable-mdpi/bg_infobar_new.9.png
deleted file mode 100644
index f3a83d4..0000000
--- a/res/drawable-mdpi/bg_infobar_new.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_search_dialog_default.9.png b/res/drawable-mdpi/btn_search_dialog_default.9.png
deleted file mode 100644
index 7275231..0000000
--- a/res/drawable-mdpi/btn_search_dialog_default.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_search_dialog_pressed.9.png b/res/drawable-mdpi/btn_search_dialog_pressed.9.png
deleted file mode 100644
index 50a9209..0000000
--- a/res/drawable-mdpi/btn_search_dialog_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_search_dialog_selected.9.png b/res/drawable-mdpi/btn_search_dialog_selected.9.png
deleted file mode 100644
index 14b774a..0000000
--- a/res/drawable-mdpi/btn_search_dialog_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_aggregated.png b/res/drawable-mdpi/ic_aggregated.png
deleted file mode 100644
index 7c2e2b0..0000000
--- a/res/drawable-mdpi/ic_aggregated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_dial_number_blk.png b/res/drawable-mdpi/ic_dial_number_blk.png
deleted file mode 100644
index c1f572d..0000000
--- a/res/drawable-mdpi/ic_dial_number_blk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_dial_number_wht.png b/res/drawable-mdpi/ic_dial_number_wht.png
deleted file mode 100644
index d303b2b..0000000
--- a/res/drawable-mdpi/ic_dial_number_wht.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_selected_friends_list.png b/res/drawable-mdpi/ic_tab_selected_friends_list.png
deleted file mode 100644
index de2c4cc..0000000
--- a/res/drawable-mdpi/ic_tab_selected_friends_list.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_unselected_friends_list.png b/res/drawable-mdpi/ic_tab_unselected_friends_list.png
deleted file mode 100644
index 80736e9..0000000
--- a/res/drawable-mdpi/ic_tab_unselected_friends_list.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/contact_card_layout.xml b/res/layout/contact_card_layout.xml
deleted file mode 100644
index 38ce17e..0000000
--- a/res/layout/contact_card_layout.xml
+++ /dev/null
@@ -1,53 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/card_root_view"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    
-    <com.android.internal.widget.ContactHeaderWidget
-        android:id="@+id/contact_header_widget"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-        
-    <ListView android:id="@+id/contact_data"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/title_bar_shadow"
-    />
-    
-    <ScrollView android:id="@android:id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-    >
-        <TextView android:id="@+id/emptyText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/no_contact_details"
-            android:textSize="20sp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:paddingLeft="10dip"
-            android:paddingRight="10dip"
-            android:paddingTop="10dip"
-            android:lineSpacingMultiplier="0.92"
-        />
-    </ScrollView>
-            
-</LinearLayout>
-
diff --git a/res/layout/contact_editor_header_view.xml b/res/layout/contact_editor_header_view.xml
deleted file mode 100644
index fb5596e..0000000
--- a/res/layout/contact_editor_header_view.xml
+++ /dev/null
@@ -1,56 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/banner"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:background="@drawable/title_bar_medium"
-    android:paddingRight="5dip">
-
-    <TextView android:id="@+id/caption"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textStyle="bold"
-        android:shadowColor="#BB000000"
-        android:shadowRadius="2.75"
-        android:text="@string/edit_contact"
-        android:layout_gravity="center_vertical"
-        />
-
-    <LinearLayout
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:layout_gravity="center_vertical" />
-
-    <TextView android:id="@+id/merge_info"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textStyle="bold"
-        android:shadowColor="#BB000000"
-        android:shadowRadius="2.75"
-        android:layout_gravity="center_vertical"
-        />
-</LinearLayout>
diff --git a/res/layout/contacts_list_search_all_item.xml b/res/layout/contacts_list_search_all_item.xml
deleted file mode 100644
index da2a3d2..0000000
--- a/res/layout/contacts_list_search_all_item.xml
+++ /dev/null
@@ -1,39 +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.
- */
--->
-
-<LinearLayout  xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
->
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/listPreferredItemHeight"
-        android:gravity="center_vertical|left"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="@string/search_for_all_contacts"
-        android:paddingLeft="14dip"
-    />
-
-    <View android:id="@+id/list_divider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@*android:drawable/divider_horizontal_dark_opaque"
-    />
-</LinearLayout>
diff --git a/res/layout/edit_phonetic_name.xml b/res/layout/edit_phonetic_name.xml
deleted file mode 100644
index 418f8fa..0000000
--- a/res/layout/edit_phonetic_name.xml
+++ /dev/null
@@ -1,62 +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.
--->
-
-<!-- "Phonetic name" field on the Edit contact screen.
-
-     In locales where a "phonetic name" is meaningful, like Japanese
-     (which uses a "furigana" or "yomi" field), this layout file
-     should include a visible label and EditText widget.
-
-     In the default locale, though, nothing here is visible.
-     This layout file MUST still provide an EditText widget with
-     id "phonetic_name" in *any* locale, though, since the Java code depends
-     on it.  (Even if the EditText is hidden we might still need to store
-     a value there, so we don't *lose* a phonetic name from the database
-     just because the user happened to edit it in a non-Japanese locale.)
-
-     For now, at least, this layout contains a complete (but hidden)
-     "phonetic name" row, so it's easy to test the phonetic_name feature
-     by temporarily removing the visibility="gone" attribute below.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:padding="0dip"
-    android:gravity="center_vertical"
-    android:baselineAligned="false"
-    android:visibility="gone"
-    >
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:paddingLeft="4dip"
-        android:gravity="left|center_vertical"
-        android:text="@string/label_phonetic_name"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        />
-    <EditText android:id="@+id/phonetic_name"
-        android:layout_width="0dip"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dip"
-        android:layout_marginRight="4dip"
-        android:gravity="center_vertical"
-        android:inputType="textPersonName|textCapWords"
-        android:hint="@string/ghostData_phonetic_name"
-        android:nextFocusDown="@id/data"
-        />
-</LinearLayout>
diff --git a/res/layout/horizontal_divider.xml b/res/layout/horizontal_divider.xml
deleted file mode 100644
index 202e663..0000000
--- a/res/layout/horizontal_divider.xml
+++ /dev/null
@@ -1,21 +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.
--->
-
-<View xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@*android:drawable/divider_horizontal_dark_opaque"
-/>
diff --git a/res/layout/tab_account_name.xml b/res/layout/tab_account_name.xml
deleted file mode 100644
index 8707d98..0000000
--- a/res/layout/tab_account_name.xml
+++ /dev/null
@@ -1,29 +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.
--->
-
-<!-- looks like Widget.TextView.ListSeparator -->
-<TextView  xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/account_name"
-    android:background="@drawable/bg_infobar_new"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/account_name_height"
-    android:layout_below="@+id/tab_scroll_view"
-    android:textStyle="normal"
-    android:textColor="@*android:color/dim_foreground_dark"
-    android:textSize="12sp"
-    android:gravity="left|center_vertical"
-    android:paddingLeft="7dip"
-/>
diff --git a/res/layout/tab_layout.xml b/res/layout/tab_layout.xml
deleted file mode 100644
index 42461f6..0000000
--- a/res/layout/tab_layout.xml
+++ /dev/null
@@ -1,30 +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.
--->
-
-<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tab_scroll_view"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentLeft="true"
-    android:scrollbars="none"
-    android:fadingEdgeLength="0dip">
-    
-    <com.android.contacts.TabStripView
-        android:id="@android:id/tabs"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-    />
-</HorizontalScrollView>
\ No newline at end of file
diff --git a/res/layout/vcardshare_main.xml b/res/layout/vcardshare_main.xml
deleted file mode 100644
index 4361cfe..0000000
--- a/res/layout/vcardshare_main.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-</LinearLayout>
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index 8f81240..b3925c0 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -13,10 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <resources>
     <!-- Size of the text in the aizy visual scroll control -->
-    <dimen name="aizy_text_size">12sp</dimen>
+    
 
     <dimen name="edit_photo_size">96dip</dimen>
 
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index c095201..e616582 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -13,7 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <resources>
     <style name="ContactBrowserTheme" parent="@android:Theme.Light.Holo">
         <item name="pressedBackground">@drawable/list_item_pressed_bg</item>
@@ -53,8 +52,7 @@
         <item name="list_item_photo_size">64dip</item>
     </style>
     
-    <style name="ContactsSearchTheme" parent="ContactPickerTheme">
-    </style>
+    
 
     <style name="ContactsPreferencesTheme" parent="@android:Theme.Light.Holo">
     </style>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f06f107..0f24531 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -13,11 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <resources>
     <color name="textColorIconOverlay">#fff</color>
     <color name="textColorIconOverlayShadow">#000</color>
-    <color name="sect_secondary">#4fff</color>
+    
     <color name="quickcontact_disambig">#f2f2f2</color>
     <color name="quickcontact_disambig_divider">#afafaf</color>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e010713..6cbfca8 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -13,7 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <resources>
     <dimen name="quickcontact_shadow_horiz">30dip</dimen>
     <dimen name="quickcontact_shadow_vert">37dip</dimen>
@@ -31,9 +30,7 @@
     <dimen name="aggregation_suggestion_icon_size">40dip</dimen>
 
     <dimen name="account_selector_popup_width">400dip</dimen>
-
-    <!-- Size of the text in the aizy visual scroll control -->
-    <dimen name="aizy_text_size">13dip</dimen>
+    
     <dimen name="aizy_preview_width">80dip</dimen>
     <dimen name="aizy_preview_height">80dip</dimen>
     
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 58851e1..aa93b79 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -71,12 +71,6 @@
          editing a contact. This string represents the built in way to edit the contact. -->
     <string name="editContactDescription">Edit contact</string>
 
-    <!-- The caption in the edit-email screen -->
-    <string name="edit_email_caption">Email address:</string>
-
-    <!-- The caption of the custom type -->
-    <string name="edit_email_type_caption">Type:</string>
-
     <!-- The description presented to the user in the Intent choose when there are multiple activities that allow
          creating a new contact. This string represents the built in way to create the contact. -->
     <string name="insertContactDescription">Create contact</string>
@@ -131,9 +125,6 @@
     <!-- Menu item that splits an item from the contact detail into a separate aggregate -->
     <string name="menu_splitAggregate">Separate</string>
 
-    <!-- Toast shown after a contact has been split from an aggregate by a user action -->
-    <string name="contactsSplitMessage">Contacts separated</string>
-
     <!-- Title of the confirmation dialog for separating contacts into multiple instances  -->
     <string name="splitConfirmation_title">Separate Contact</string>
 
@@ -208,9 +199,6 @@
     <!-- The label describing the custom ringtone for a contact -->
     <string name="label_ringtone">Ringtone</string>
 
-    <!-- Hint text for the contact name when editing -->
-    <string name="ghostData_name">First and Last</string>
-
     <!-- Hint text for the phonetic reading of the contact name when editing -->
     <string name="ghostData_phonetic_name">Phonetic name</string>
 
@@ -241,7 +229,7 @@
     <string name="postalLabelsGroup">Address</string>
 
     <!-- The order of the items below is important, don't reorder without changing EditContactActivity.java -->
-    <skip />
+    <skip/>
     <!-- The labels that are under the otherLabelsGroup when editing a contact. [CHAR LIMIT=20] -->
     <string-array name="otherLabels">
         <!-- An organization associated with a contact -->
@@ -495,9 +483,6 @@
         \n<li>Touch the star next to the contact\'s name\n</li>"
     </string>
 
-    <!-- Activity title for the activity that lets the user choose which groups of contacts to sync from the server -->
-
-
     <!-- Live folder label for all contacts -->
     <string name="liveFolder_all_label">All contacts</string>
 
@@ -561,9 +546,6 @@
          the email address, e.g. "Add xyz@foo.com to contacts?" -->
     <string name="add_contact_dlg_message_fmt">Add \"<xliff:g id="email">%s</xliff:g>\" to contacts?</string>
 
-    <!-- Label for the all data tab in the view and edit card -->
-    <string name="all_tab_label">All</string>
-
     <!-- String describing the image on ImageButton one
 
         Note: AccessibilityServices use this attribute to announce what the view represents.
@@ -991,14 +973,6 @@
     <!-- Single-character overlay for other phone numbers when creating desktop shortcuts -->
     <string name="type_short_other">O</string>
 
-    <!-- In edit dialog, shown if the contact is marked as being read-only -->
-    <string name="edit_read_only">This contact is read-only</string>
-
-    <!-- Shown as the header title over a collapsible section that, by default, hides
-         secondary contact detail edit fields, such as birthday. -->
-    <string name="edit_secondary_collapse">More</string>
-
-    <string name="dialog_primary_name">Primary name</string>
     <string name="dialog_new_contact_account">Create contact under account</string>
 
     <string name="menu_sync_remove">Remove sync group</string>
@@ -1196,9 +1170,6 @@
     <!-- String describing which account a contact came from when editing it -->
     <string name="from_account_format">from <xliff:g id="source" example="user@gmail.com">%1$s</xliff:g></string>
 
-    <!-- String describing both account type and account name -->
-    <string name="account_type_and_name"><xliff:g id="source" example="Gmail">%1$s</xliff:g> contact from <xliff:g id="source" example="user@gmail.com">%2$s</xliff:g></string>
-
     <!-- Checkbox asking the user if they want to display a particular photo for a contact -->
     <string name="use_photo_as_primary">Use this photo</string>
 
@@ -1265,15 +1236,9 @@
     <!-- Button shown in the contacts app if the background process updating contacts fails because of memory shortage -->
     <string name="upgrade_out_of_memory_retry">Retry upgrade</string>
 
-    <!-- Title shown in the search result activity of contacts app -->
-    <string name="search_results_for">Search results for: <xliff:g id="query">%s</xliff:g></string>
-
     <!-- Title shown in the search result activity of contacts app while searching -->
     <string name="search_results_searching">Searching...</string>
 
-    <!-- Message of progress dialog for multiple picker -->
-    <string name="adding_recipients">"Loading \u2026"</string>
-
     <!-- Label to display only selection in multiple picker -->
     <string name="menu_display_selected">"Show selected"</string>
 
@@ -1294,9 +1259,6 @@
         <item quantity="other"><xliff:g id="count">%d</xliff:g>" recipients selected"</item>
     </plurals>
 
-    <!-- Separator label to display unknown recipients in multiple picker -->
-    <string name="unknown_contacts_separator">"Unknown contacts"</string>
-
     <!-- The text displayed when the contacts list is empty while displaying only selected contacts in multiple picker -->
     <string name="no_contacts_selected">"No contacts selected."</string>
 
@@ -1309,12 +1271,6 @@
     <!-- Attbution of a contact status update, when the time of update is known -->
     <string name="contact_status_update_attribution_with_date"><xliff:g id="date" example="3 hours ago">%1$s</xliff:g> via <xliff:g id="source" example="Google Talk">%2$s</xliff:g></string>
 
-    <!-- String describing the Edit push button
-
-         Used by AccessibilityService to announce the purpose of the view.
-    -->
-    <string name="description_edit">edit</string>
-
     <!-- String describing the Star/Favorite checkbox
 
          Used by AccessibilityService to announce the purpose of the view.
@@ -1331,15 +1287,6 @@
         <item quantity="other">merged from <xliff:g id="count">%0$d</xliff:g> sources</item>
     </plurals>
 
-    <!-- Command to delete a RawContact (a Fragment of a Contact) -->
-    <string name="edit_delete_rawcontact">Delete</string>
-
-    <!-- Shown in a Toast to indicate an error while trying to save the Data -->
-    <string name="edit_error_saving">Error saving</string>
-
-    <!-- Text in the editor to show the structured editor -->
-    <string name="edit_structured_editor_button">...</string>
-
     <!-- The name of the invisible local contact directory -->
     <string name="local_invisible_directory">Other</string>
 
@@ -1361,10 +1308,6 @@
     <string name="aggregation_suggestion_edit_dialog_message">Switch to editing
         the selected contact? Information you entered so far will be copied.</string>
 
-    <!-- The button next to a contact aggregation suggestion in Contact editor. Causes the UI
-    to switch to the suggested contact in the editor. [CHAR LIMIT=12]-->
-    <string name="aggregation_suggestion_edit_button">Edit</string>
-
     <!-- The menu item (or button) that creates a local copy of a corporate contact. [CHAR LIMIT=40]-->
     <string name="menu_copyContact">Copy to my contacts</string>
 
@@ -1395,9 +1338,6 @@
     <!-- Contact list filter label indicating that the list is showing all starred contacts [CHAR LIMIT=64] -->
     <string name="list_filter_all_starred">Starred</string>
 
-    <!-- Contact list filter label indicating that the list is showing starred contacts for the account [CHAR LIMIT=64] -->
-    <string name="list_filter_starred">Starred</string>
-
     <!-- Contact list filter indicating that the list shows groups chosen by the user [CHAR LIMIT=64] -->
     <string name="list_filter_custom">Custom</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ee65b65..ccf60ae 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -13,16 +13,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <resources>
     <style name="DialtactsTheme" parent="@android:Theme">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
-    <style name="ContactsSearchTheme" parent="@android:Theme.Translucent.NoTitleBar">
-        <item name="android:windowAnimationStyle">@style/ContactsSearchAnimation</item>
-    </style>
+    
 
     <!-- TODO: Once there are assets for More/Less buttons, remove these styles -->
     <style name="EmptyButton">
@@ -34,10 +31,7 @@
         <item name="android:src">@drawable/ic_btn_round_more</item>
     </style>
 
-    <style name="LessButton">
-        <item name="android:background">@drawable/btn_circle</item>
-        <item name="android:src">@drawable/ic_btn_round_less</item>
-    </style>
+    
 
     <style name="CallDetailActivityTheme" parent="android:Theme.NoTitleBar">
         <item name="android:windowContentOverlay">@null</item>