diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 3337f0b..9698949 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -17,48 +17,6 @@
 
 package com.android.providers.telephony;
 
-import static android.provider.Telephony.Carriers.APN;
-import static android.provider.Telephony.Carriers.AUTH_TYPE;
-import static android.provider.Telephony.Carriers.BEARER;
-import static android.provider.Telephony.Carriers.BEARER_BITMASK;
-import static android.provider.Telephony.Carriers.CARRIER_DELETED;
-import static android.provider.Telephony.Carriers.CARRIER_DELETED_BUT_PRESENT_IN_XML;
-import static android.provider.Telephony.Carriers.CARRIER_EDITED;
-import static android.provider.Telephony.Carriers.CARRIER_ENABLED;
-import static android.provider.Telephony.Carriers.CONTENT_URI;
-import static android.provider.Telephony.Carriers.CURRENT;
-import static android.provider.Telephony.Carriers.EDITED;
-import static android.provider.Telephony.Carriers.MAX_CONNS;
-import static android.provider.Telephony.Carriers.MAX_CONNS_TIME;
-import static android.provider.Telephony.Carriers.MCC;
-import static android.provider.Telephony.Carriers.MMSC;
-import static android.provider.Telephony.Carriers.MMSPORT;
-import static android.provider.Telephony.Carriers.MMSPROXY;
-import static android.provider.Telephony.Carriers.MNC;
-import static android.provider.Telephony.Carriers.MODEM_COGNITIVE;
-import static android.provider.Telephony.Carriers.MTU;
-import static android.provider.Telephony.Carriers.MVNO_MATCH_DATA;
-import static android.provider.Telephony.Carriers.MVNO_TYPE;
-import static android.provider.Telephony.Carriers.NAME;
-import static android.provider.Telephony.Carriers.NUMERIC;
-import static android.provider.Telephony.Carriers.PASSWORD;
-import static android.provider.Telephony.Carriers.PORT;
-import static android.provider.Telephony.Carriers.PROFILE_ID;
-import static android.provider.Telephony.Carriers.PROTOCOL;
-import static android.provider.Telephony.Carriers.PROXY;
-import static android.provider.Telephony.Carriers.ROAMING_PROTOCOL;
-import static android.provider.Telephony.Carriers.SERVER;
-import static android.provider.Telephony.Carriers.SUBSCRIPTION_ID;
-import static android.provider.Telephony.Carriers.TYPE;
-import static android.provider.Telephony.Carriers.UNEDITED;
-import static android.provider.Telephony.Carriers.USER;
-import static android.provider.Telephony.Carriers.USER_DELETED;
-import static android.provider.Telephony.Carriers.USER_DELETED_BUT_PRESENT_IN_XML;
-import static android.provider.Telephony.Carriers.USER_EDITED;
-import static android.provider.Telephony.Carriers.USER_VISIBLE;
-import static android.provider.Telephony.Carriers.WAIT_TIME;
-import static android.provider.Telephony.Carriers._ID;
-
 import android.content.ContentProvider;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -88,8 +46,8 @@
 import android.util.Log;
 import android.util.Xml;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.XmlUtils;
+import com.android.internal.annotations.VisibleForTesting;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -103,13 +61,15 @@
 import java.util.List;
 import java.util.Map;
 
+import static android.provider.Telephony.Carriers.*;
+
 public class TelephonyProvider extends ContentProvider
 {
     private static final String DATABASE_NAME = "telephony.db";
     private static final boolean DBG = true;
     private static final boolean VDBG = false; // STOPSHIP if true
 
-    private static final int DATABASE_VERSION = 20 << 16;
+    private static final int DATABASE_VERSION = 19 << 16;
     private static final int URL_UNKNOWN = 0;
     private static final int URL_TELEPHONY = 1;
     private static final int URL_CURRENT = 2;
@@ -264,9 +224,6 @@
             + SubscriptionManager.MNC + " INTEGER DEFAULT 0,"
             + SubscriptionManager.SIM_PROVISIONING_STATUS
                 + " INTEGER DEFAULT " + SubscriptionManager.SIM_PROVISIONED + ","
-            + SubscriptionManager.IS_EMBEDDED + " INTEGER DEFAULT 0,"
-            + SubscriptionManager.ACCESS_RULES + " BLOB,"
-            + SubscriptionManager.IS_REMOVABLE + " INTEGER DEFAULT 0,"
             + SubscriptionManager.CB_EXTREME_THREAT_ALERT + " INTEGER DEFAULT 1,"
             + SubscriptionManager.CB_SEVERE_THREAT_ALERT + " INTEGER DEFAULT 1,"
             + SubscriptionManager.CB_AMBER_ALERT + " INTEGER DEFAULT 1,"
@@ -837,23 +794,6 @@
                 }
                 oldVersion = 19 << 16 | 6;
             }
-            if (oldVersion < (20 << 16 | 6)) {
-                try {
-                    // Try to update the siminfo table. It might not be there.
-                    db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN " +
-                            SubscriptionManager.IS_EMBEDDED + " INTEGER DEFAULT 0;");
-                    db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN " +
-                            SubscriptionManager.ACCESS_RULES + " BLOB;");
-                    db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN " +
-                            SubscriptionManager.IS_REMOVABLE + " INTEGER DEFAULT 0;");
-                } catch (SQLiteException e) {
-                    if (DBG) {
-                        log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +
-                                " The table will get created in onOpen.");
-                    }
-                }
-                oldVersion = 20 << 16 | 6;
-            }
             if (DBG) {
                 log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
             }