diff --git a/res/drawable-hdpi/status_icon_large.png b/res/drawable-hdpi/status_icon_large.png
deleted file mode 100644
index 4d8a8041..00000000
Binary files a/res/drawable-hdpi/status_icon_large.png and /dev/null differ
diff --git a/res/drawable-mdpi/status_icon_large.png b/res/drawable-mdpi/status_icon_large.png
deleted file mode 100644
index ebacc6ca..00000000
Binary files a/res/drawable-mdpi/status_icon_large.png and /dev/null differ
diff --git a/res/layout/full_playback.xml b/res/layout/full_playback.xml
index ff93badb..f65d83b9 100644
--- a/res/layout/full_playback.xml
+++ b/res/layout/full_playback.xml
@@ -26,7 +26,6 @@ THE SOFTWARE.
 		android:layout_height="fill_parent"
 		android:layout_width="fill_parent" />
 	<LinearLayout
-		android:id="@+id/controls_top"
 		android:layout_height="wrap_content"
 		android:layout_width="fill_parent"
 		android:layout_gravity="top"
diff --git a/res/layout/full_playback_alt.xml b/res/layout/full_playback_alt.xml
index 84131be3..35e125b6 100644
--- a/res/layout/full_playback_alt.xml
+++ b/res/layout/full_playback_alt.xml
@@ -26,7 +26,6 @@ THE SOFTWARE.
 		android:layout_height="fill_parent"
 		android:layout_width="fill_parent" />
 	<LinearLayout
-		android:id="@+id/top_group"
 		android:layout_height="wrap_content"
 		android:layout_width="fill_parent"
 		android:layout_gravity="top|left"
diff --git a/res/layout/library_content.xml b/res/layout/library_content.xml
index fe0bfa16..a1a8eb9d 100644
--- a/res/layout/library_content.xml
+++ b/res/layout/library_content.xml
@@ -32,7 +32,6 @@ THE SOFTWARE.
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content" >
 			<TextView
-				android:id="@+id/artist_tab"
 				android:focusable="true"
 				android:background="@drawable/buttonbar"
 				android:drawableTop="@drawable/ic_tab_artists"
@@ -48,7 +47,6 @@ THE SOFTWARE.
 				android:ellipsize="marquee"
 				android:singleLine="true" />
 			<TextView
-				android:id="@+id/album_tab"
 				android:focusable="true"
 				android:background="@drawable/buttonbar"
 				android:drawableTop="@drawable/ic_tab_albums"
@@ -64,7 +62,6 @@ THE SOFTWARE.
 				android:ellipsize="marquee"
 				android:singleLine="true" />
 			<TextView
-				android:id="@+id/song_tab"
 				android:focusable="true"
 				android:background="@drawable/buttonbar"
 				android:drawableTop="@drawable/ic_tab_songs"
@@ -80,7 +77,6 @@ THE SOFTWARE.
 				android:ellipsize="marquee"
 				android:singleLine="true" />
 			<TextView
-				android:id="@+id/playlist_tab"
 				android:focusable="true"
 				android:background="@drawable/buttonbar"
 				android:drawableTop="@drawable/ic_tab_playlists"
@@ -96,7 +92,6 @@ THE SOFTWARE.
 				android:ellipsize="marquee"
 				android:singleLine="true" />
 			<TextView
-				android:id="@+id/genre_tab"
 				android:focusable="true"
 				android:background="@drawable/buttonbar"
 				android:drawableTop="@drawable/ic_tab_genres"
diff --git a/res/layout/library_nocontrols.xml b/res/layout/library_nocontrols.xml
index 9293edd9..5e9328e7 100644
--- a/res/layout/library_nocontrols.xml
+++ b/res/layout/library_nocontrols.xml
@@ -20,12 +20,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<LinearLayout
-		android:id="@+id/selector_layout"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:orientation="vertical">
-		<include layout="@layout/library_content" />
-	</LinearLayout>
-</merge>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:orientation="vertical">
+	<include layout="@layout/library_content" />
+</LinearLayout>
diff --git a/res/layout/library_withcontrols.xml b/res/layout/library_withcontrols.xml
index 1235696b..46f63c04 100644
--- a/res/layout/library_withcontrols.xml
+++ b/res/layout/library_withcontrols.xml
@@ -20,69 +20,67 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<LinearLayout
-		android:id="@+id/selector_layout"
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:orientation="vertical">
+	<include layout="@layout/library_content" />
+	<RelativeLayout
+		android:id="@+id/controls"
+		android:background="@drawable/music_bottom_playback_bg"
 		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:orientation="vertical">
-		<include layout="@layout/library_content" />
-		<RelativeLayout
-			android:id="@+id/controls"
-			android:background="@drawable/music_bottom_playback_bg"
+		android:layout_height="80dip">
+		<ImageView
+			android:id="@+id/cover"
+			android:scaleType="fitCenter"
+			android:maxWidth="80dip"
+			android:layout_width="80dip"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center" />
+		<TextView
+			android:id="@+id/status_text"
+			android:text="@string/none"
+			android:textSize="16sp"
+			android:singleLine="true"
+			android:ellipsize="marquee"
+			android:gravity="center"
 			android:layout_width="fill_parent"
-			android:layout_height="80dip">
-			<ImageView
-				android:id="@+id/cover"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/cover"
+			android:layout_alignParentRight="true" />
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/status_text"
+			android:layout_toRightOf="@id/cover"
+			android:layout_alignParentRight="true"
+			android:layout_alignParentBottom="true">
+			<ImageButton
+				android:id="@+id/previous"
+				android:layout_height="wrap_content"
+				android:layout_width="0px"
+				android:layout_weight="1"
+				android:background="@null"
 				android:scaleType="fitCenter"
-				android:maxWidth="80dip"
-				android:layout_width="80dip"
-				android:layout_height="fill_parent"
-				android:layout_gravity="center" />
-			<TextView
-				android:id="@+id/status_text"
-				android:text="@string/none"
-				android:textSize="16sp"
-				android:singleLine="true"
-				android:ellipsize="marquee"
-				android:gravity="center"
-				android:layout_width="fill_parent"
+				android:src="@drawable/previous" />
+			<ImageButton
+				android:id="@+id/play_pause"
 				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/cover"
-				android:layout_alignParentRight="true" />
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="fill_parent"
+				android:layout_width="0px"
+				android:layout_weight="1"
+				android:background="@null"
+				android:scaleType="fitCenter"
+				android:src="@drawable/play" />
+			<ImageButton
+				android:id="@+id/next"
 				android:layout_height="wrap_content"
-				android:layout_below="@id/status_text"
-				android:layout_toRightOf="@id/cover"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentBottom="true">
-				<ImageButton
-					android:id="@+id/previous"
-					android:layout_height="wrap_content"
-					android:layout_width="0px"
-					android:layout_weight="1"
-					android:background="@null"
-					android:scaleType="fitCenter"
-					android:src="@drawable/previous" />
-				<ImageButton
-					android:id="@+id/play_pause"
-					android:layout_height="wrap_content"
-					android:layout_width="0px"
-					android:layout_weight="1"
-					android:background="@null"
-					android:scaleType="fitCenter"
-					android:src="@drawable/play" />
-				<ImageButton
-					android:id="@+id/next"
-					android:layout_height="wrap_content"
-					android:layout_width="0px"
-					android:layout_weight="1"
-					android:background="@null"
-					android:scaleType="fitCenter"
-					android:src="@drawable/next" />
-			</LinearLayout>
-		</RelativeLayout>
-	</LinearLayout>
-</merge>
+				android:layout_width="0px"
+				android:layout_weight="1"
+				android:background="@null"
+				android:scaleType="fitCenter"
+				android:src="@drawable/next" />
+		</LinearLayout>
+	</RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values-nb/translatable.xml b/res/values-nb/translatable.xml
index 9377359e..5cedb6ce 100644
--- a/res/values-nb/translatable.xml
+++ b/res/values-nb/translatable.xml
@@ -28,14 +28,10 @@ THE SOFTWARE.
 	<string name="empty_queue">Ingen låter valgt. Plukk noen fra biblioteket (søk tast) eller gå inn i tilfeldig-modus(i menyen).</string>
 	<string name="settings">Instillinger</string>
 	<string name="library">Bibliotek</string>
-	<string name="display_mode">Visningsmodus</string>
 	<string name="random_enabling">Tilfeldig aktivert</string>
 	<string name="song_load_failed">Kunne ikke laste låt %s. Den kan være skadet eller mangler.</string>
 	<string name="queue_cleared">Kø ryddet.</string>
 
-	<!-- Widgets -->
-	<string name="starting">Oppstart...</string>
-
 	<!-- New Playlist Dialog -->
 	<string name="choose_playlist_name">Velg Spilleliste Navn</string>
 	<string name="create">Lage</string>
@@ -66,7 +62,6 @@ THE SOFTWARE.
 		<item quantity="one">1 låt lagt til spilleliste %2$s.</item>
 		<item quantity="other">%1$d låter lagt til spilleliste %2$s.</item>
 	</plurals>
-	<string name="deleting">Sletter...</string>
 	<string name="playlist_deleted">Spilleliste %s slettet.</string>
 	<plurals name="deleted">
 		<item quantity="one">1 låt slettet.</item>
diff --git a/res/values-sk/translatable.xml b/res/values-sk/translatable.xml
index e164beb9..2add15eb 100644
--- a/res/values-sk/translatable.xml
+++ b/res/values-sk/translatable.xml
@@ -28,14 +28,10 @@ THE SOFTWARE.
 	<string name="empty_queue">Neboli vybrané žiadne skladby. Vyberte niektorú z knižnice (vyhľadávaním) alebo zvoľte náhodný výber (cez menu).</string>
 	<string name="settings">Nastavenia</string>
 	<string name="library">Knižnica</string>
-	<string name="display_mode">Režim zobrazenia</string>
 	<string name="random_enabling">Náhodný výber zapnutý.</string>
 	<string name="song_load_failed">Načítanie skladby %s zlyhalo. Môže byť poškodená, alebo chýba.</string>
 	<string name="queue_cleared">Zoznam vymazaný.</string>
 
-	<!-- Widgets -->
-	<string name="starting">Spúštanie…</string>
-
 	<!-- New Playlist Dialog -->
 	<string name="choose_playlist_name">Vyberte názov zoznamu skladieb</string>
 	<string name="create">Vytvoriť</string>
@@ -69,7 +65,6 @@ THE SOFTWARE.
 		<item quantity="few">%1$d skladby pridané do zoznamu skladieb %2$s.</item>
 		<item quantity="other">%1$d skladieb pridaných do zoznamu skladieb %2$s.</item>
 	</plurals>
-	<string name="deleting">Odstraňuje sa…</string>
 	<string name="playlist_deleted">Zoznam skladieb %s odstránený.</string>
 	<plurals name="deleted">
 		<item quantity="one">1 skladba odstránená.</item>
diff --git a/res/values/translatable.xml b/res/values/translatable.xml
index ab4b2ba3..dec1a5f9 100644
--- a/res/values/translatable.xml
+++ b/res/values/translatable.xml
@@ -28,7 +28,6 @@ THE SOFTWARE.
 	<string name="empty_queue">No songs selected. Pick some from the library (search key) or enter random mode by tapping this message.</string>
 	<string name="settings">Settings</string>
 	<string name="library">Library</string>
-	<string name="display_mode">Display Mode</string>
 	<string name="no_shuffle">No shuffle</string>
 	<string name="shuffle_songs">Shuffle songs</string>
 	<string name="shuffle_albums">Shuffle albums</string>
@@ -40,9 +39,6 @@ THE SOFTWARE.
 	<string name="song_load_failed">Failed to load song %s. It may be corrupt or missing.</string>
 	<string name="queue_cleared">Queue cleared.</string>
 
-	<!-- Widgets -->
-	<string name="starting">Starting up...</string>
-
 	<!-- New Playlist Dialog -->
 	<string name="choose_playlist_name">Choose Playlist Name</string>
 	<string name="create">Create</string>
@@ -73,7 +69,6 @@ THE SOFTWARE.
 		<item quantity="one">1 song added to playlist %2$s.</item>
 		<item quantity="other">%1$d songs added to playlist %2$s.</item>
 	</plurals>
-	<string name="deleting">Deleting...</string>
 	<string name="playlist_deleted">Playlist %s deleted.</string>
 	<plurals name="deleted">
 		<item quantity="one">1 song deleted.</item>
diff --git a/src/org/kreed/vanilla/Cache.java b/src/org/kreed/vanilla/Cache.java
index ae27ec73..cc1a467c 100644
--- a/src/org/kreed/vanilla/Cache.java
+++ b/src/org/kreed/vanilla/Cache.java
@@ -158,15 +158,4 @@ public class Cache<E> {
 		mKeys[count] = key;
 		mValues[count] = value;
 	}
-
-	/**
-	 * Clear the keys and return the values to be cleared by the caller.
-	 *
-	 * @return The values in the cache, untouched.
-	 */
-	public Object[] clear()
-	{
-		Arrays.fill(mKeys, -1);
-		return mValues;
-	}
 }