diff --git a/app/src/main/java/com/simplemobiletools/calendar/activities/AboutActivity.java b/app/src/main/java/com/simplemobiletools/calendar/activities/AboutActivity.java
index dd5790d25..4a94259fe 100644
--- a/app/src/main/java/com/simplemobiletools/calendar/activities/AboutActivity.java
+++ b/app/src/main/java/com/simplemobiletools/calendar/activities/AboutActivity.java
@@ -11,7 +11,6 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.simplemobiletools.calendar.BuildConfig;
-import com.simplemobiletools.calendar.Config;
 import com.simplemobiletools.calendar.R;
 
 import java.util.Calendar;
@@ -55,7 +54,7 @@ public class AboutActivity extends SimpleActivity {
     }
 
     private void setupRateUs() {
-        if (Config.newInstance(getApplicationContext()).getIsFirstRun()) {
+        if (mConfig.getIsFirstRun()) {
             mRateUs.setVisibility(View.GONE);
         }
     }
diff --git a/app/src/main/java/com/simplemobiletools/calendar/activities/SettingsActivity.java b/app/src/main/java/com/simplemobiletools/calendar/activities/SettingsActivity.java
index 82816a1bd..69a5efb1a 100644
--- a/app/src/main/java/com/simplemobiletools/calendar/activities/SettingsActivity.java
+++ b/app/src/main/java/com/simplemobiletools/calendar/activities/SettingsActivity.java
@@ -4,7 +4,6 @@ import android.os.Bundle;
 import android.support.v4.app.TaskStackBuilder;
 import android.support.v7.widget.SwitchCompat;
 
-import com.simplemobiletools.calendar.Config;
 import com.simplemobiletools.calendar.R;
 
 import butterknife.BindView;
@@ -16,13 +15,10 @@ public class SettingsActivity extends SimpleActivity {
     @BindView(R.id.settings_sunday_first) SwitchCompat mSundayFirstSwitch;
     @BindView(R.id.settings_week_numbers) SwitchCompat mWeekNumbersSwitch;
 
-    private static Config mConfig;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
-        mConfig = Config.newInstance(getApplicationContext());
         ButterKnife.bind(this);
 
         setupDarkTheme();
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
index 18b42db2c..6bda2be3a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
@@ -33,7 +33,7 @@ class MainActivity : SimpleActivity(), NavigationListener {
 
     override fun onDestroy() {
         super.onDestroy()
-        Config.newInstance(applicationContext).isFirstRun = false
+        mConfig.isFirstRun = false
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {