diff --git a/packages/LineageSettingsProvider/res/values/defaults.xml b/packages/LineageSettingsProvider/res/values/defaults.xml
index b73e00be580596810180eb82bb4f5ee834c17066..79dbd4a66520ebf600cda7cc3291e524de54021a 100644
--- a/packages/LineageSettingsProvider/res/values/defaults.xml
+++ b/packages/LineageSettingsProvider/res/values/defaults.xml
@@ -40,7 +40,7 @@
          * 1: Display the battery as a circle
          * 2: Display the battery as plain text
     -->
-    <integer name="def_battery_style">2</integer>
+    <integer name="def_battery_style">0</integer>
 
     <!-- Default for LineageSettings.Secure.LOCKSCREEN_VISUALIZER_ENABLED -->
     <bool name="def_lockscreen_visualizer">true</bool>
@@ -116,6 +116,6 @@
          * 1: show the clock in the center
          * 2: show the clock in the left position (LTR)
     -->
-    <integer name="def_clock_position">1</integer>
+    <integer name="def_clock_position">2</integer>
 
 </resources>
diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
index 9fa40148ffac7729cf328db8beb9759a758d5797..670b402feea60afd45e4190ac7d4b86ffabf8096 100644
--- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
+++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
@@ -52,8 +52,6 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
 
     private static final String DATABASE_NAME = "lineagesettings.db";
     private static final int DATABASE_VERSION = 12;
-    private static final int E_DB_INCREMENT = 1;
-    private static final int E_DATABASE_VERSION = DATABASE_VERSION+E_DB_INCREMENT;
 
     private static final String DATABASE_NAME_OLD = "cmsettings.db";
 
@@ -144,7 +142,7 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
      * @param userId
      */
     public LineageDatabaseHelper(Context context, int userId) {
-        super(context, dbNameForUser(context, userId, DATABASE_NAME), null, E_DATABASE_VERSION);
+        super(context, dbNameForUser(context, userId, DATABASE_NAME), null, DATABASE_VERSION);
         mContext = context;
         mUserHandle = userId;
 
@@ -201,12 +199,9 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        Log.d(TAG, "Upgrading from version: " + oldVersion + " to " + newVersion);
+        if (LOCAL_LOGV) Log.d(TAG, "Upgrading from version: " + oldVersion + " to " + newVersion);
         int upgradeVersion = oldVersion;
-        int eUpgradeVersion = oldVersion;
-        if(upgradeVersion>13){
-            upgradeVersion = upgradeVersion - E_DB_INCREMENT; //to respect lineage version
-	}
+
         if (upgradeVersion < 2) {
             db.beginTransaction();
             try {
@@ -340,7 +335,7 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
 
                     if (value == 0) {
                         stmt = db.compileStatement("UPDATE system SET value=? WHERE name=?");
-                        stmt.bindLong(1, 1);
+                        stmt.bindLong(1, 2);
                         stmt.bindString(2, LineageSettings.System.STATUS_BAR_CLOCK);
                         stmt.execute();
                     }
@@ -434,43 +429,6 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
             }
             upgradeVersion = 12;
         }
-
-        if(upgradeVersion > eUpgradeVersion)
-            eUpgradeVersion = upgradeVersion;
-        if (eUpgradeVersion < 13) {
-             if (mUserHandle == UserHandle.USER_OWNER) {
-                // Update STATUS_BAR_CLOCK
-                db.beginTransaction();
-                SQLiteStatement stmt = null;
-                try {
-                    stmt = db.compileStatement("UPDATE system SET value=? WHERE name=?");
-                    stmt.bindLong(1, 1);
-                    stmt.bindString(2, LineageSettings.System.STATUS_BAR_CLOCK);
-                    stmt.execute();
-                    db.setTransactionSuccessful();
-                } catch (SQLiteDoneException ex) {
-                    // LineageSettings.System.STATUS_BAR_CLOCK is not set
-                } finally {
-                    if (stmt != null) stmt.close();
-                    db.endTransaction();
-                }
-                db.beginTransaction();
-                stmt = null;
-                try {
-                    stmt = db.compileStatement("UPDATE system SET value=? WHERE name=?");
-                    stmt.bindLong(1, 2);
-                    stmt.bindString(2, LineageSettings.System.STATUS_BAR_BATTERY_STYLE);
-                    stmt.execute();
-                    db.setTransactionSuccessful();
-                } catch (SQLiteDoneException ex) {
-                    // LineageSettings.System.STATUS_BAR_BATTERY_STYLE is not set
-                } finally {
-                    if (stmt != null) stmt.close();
-                    db.endTransaction();
-               }
-            }
-            eUpgradeVersion = 14;
-        }
         // *** Remember to update DATABASE_VERSION above!
     }