diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index 5c6a6e0d..853cef0f 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -350,11 +350,6 @@ class Shadowsocks
 
     super.onCreate(savedInstanceState)
 
-    // Update the profile
-    if (!ShadowsocksApplication.settings.getBoolean(ShadowsocksApplication.getVersionName, false)) {
-      currentProfile = ShadowsocksApplication.profileManager.create()
-    }
-
     // Initialize the profile
     currentProfile = {
       ShadowsocksApplication.currentProfile getOrElse currentProfile
@@ -392,12 +387,6 @@ class Shadowsocks
             changeSwitch(checked = false)
         case false =>
           serviceStop()
-          if (fab.isEnabled) {
-            fab.setEnabled(false)
-            handler.postDelayed(() => {
-              fab.setEnabled(true)
-            }, 1000)
-          }
       }
     })
     fab.setOnLongClickListener((v: View) => {
@@ -444,6 +433,8 @@ class Shadowsocks
     }
 
     updatePreferenceScreen()
+
+    serviceStop()
   }
 
   def addProfile(profile: Profile) {
@@ -498,7 +489,6 @@ class Shadowsocks
   }
 
   private def setPreferenceEnabled(enabled: Boolean) {
-    preferences.findPreference(Key.profiles).setEnabled(enabled)
     preferences.findPreference(Key.isNAT).setEnabled(enabled)
     for (name <- Shadowsocks.PROXY_PREFS) {
       val pref = preferences.findPreference(name)
diff --git a/src/main/scala/com/github/shadowsocks/database/ProfileManager.scala b/src/main/scala/com/github/shadowsocks/database/ProfileManager.scala
index 24da9121..2370153f 100644
--- a/src/main/scala/com/github/shadowsocks/database/ProfileManager.scala
+++ b/src/main/scala/com/github/shadowsocks/database/ProfileManager.scala
@@ -163,10 +163,4 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) {
     updateProfile(profile)
     profile
   }
-
-  def create(): Profile = {
-    val profile = loadFromPreferences
-    createOrUpdateProfile(profile)
-    profile
-  }
 }