diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 195214fc587..c5d686f1a07 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -72,7 +72,6 @@
         </RelativeLayout>
 
         <LinearLayout
-            xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/title_area"
@@ -148,52 +147,6 @@
 
             </LinearLayout>
 
-            <RelativeLayout
-                android:id="@+id/button_bar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:visibility="gone" >
-
-                <Button
-                    android:id="@+id/back_button"
-                    android:layout_width="150dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_margin="5dip"
-                    android:text="@string/wifi_setup_back" />
-
-                <Button
-                    android:id="@+id/custom_button"
-                    android:layout_width="150dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_margin="5dip"
-                    android:text="@string/wifi_setup_skip" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:orientation="horizontal" >
-
-                    <Button
-                        android:id="@+id/skip_button"
-                        android:layout_width="150dip"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dip"
-                        android:text="@string/wifi_setup_skip"
-                        android:visibility="gone" />
-
-                    <Button
-                        android:id="@+id/next_button"
-                        android:layout_width="150dip"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dip"
-                        android:text="@string/wifi_setup_next"
-                        android:visibility="gone" />
-                    </LinearLayout>
-            </RelativeLayout>
         </LinearLayout>
     </view>
     <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
index 7ef648085db..b64e78130fd 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
@@ -24,8 +24,6 @@ import android.content.IntentFilter;
 import android.content.res.TypedArray;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.util.Log;
@@ -35,7 +33,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.PopupMenu;
 import android.widget.PopupMenu.OnMenuItemClickListener;
diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java
index 86401fb62e1..d92e81fdc5f 100644
--- a/src/com/android/settings/wifi/WifiSetupActivity.java
+++ b/src/com/android/settings/wifi/WifiSetupActivity.java
@@ -45,9 +45,6 @@ public class WifiSetupActivity extends WifiPickerActivity
     private static final String EXTRA_ALLOW_SKIP = "allowSkip";
     private static final String EXTRA_USE_IMMERSIVE_MODE = "useImmersiveMode";
 
-    // this boolean extra shows a custom button that we can control
-    protected static final String EXTRA_SHOW_CUSTOM_BUTTON = "wifi_show_custom_button";
-
     // Extra containing the resource name of the theme to be used
     private static final String EXTRA_THEME = "theme";
     private static final String THEME_HOLO = "holo";
@@ -152,7 +149,6 @@ public class WifiSetupActivity extends WifiPickerActivity
             getWindow().setNavigationBarColor(Color.TRANSPARENT);
             getWindow().setStatusBarColor(Color.TRANSPARENT);
         }
-        getIntent().putExtra(EXTRA_SHOW_CUSTOM_BUTTON, false);
         bar.getNextButton().setText(R.string.skip_label);
 
         if (!getIntent().getBooleanExtra(EXTRA_ALLOW_SKIP, true)) {