diff --git a/briar-android/src/org/briarproject/android/AndroidComponent.java b/briar-android/src/org/briarproject/android/AndroidComponent.java
index 623aba6e5..fe444a02f 100644
--- a/briar-android/src/org/briarproject/android/AndroidComponent.java
+++ b/briar-android/src/org/briarproject/android/AndroidComponent.java
@@ -47,11 +47,17 @@ import dagger.Component;
 })
 public interface AndroidComponent extends CoreEagerSingletons {
 	// Exposed objects
-	@CryptoExecutor Executor cryptoExecutor();
+	@CryptoExecutor
+	Executor cryptoExecutor();
+
 	PasswordStrengthEstimator passwordStrengthIndicator();
+
 	CryptoComponent cryptoComponent();
+
 	DatabaseConfig databaseConfig();
+
 	AuthorFactory authFactory();
+
 	ReferenceManager referenceMangager();
 
 	@DatabaseExecutor
diff --git a/briar-android/src/org/briarproject/android/BaseActivity.java b/briar-android/src/org/briarproject/android/BaseActivity.java
index 6ae3eb8c2..e14eb2963 100644
--- a/briar-android/src/org/briarproject/android/BaseActivity.java
+++ b/briar-android/src/org/briarproject/android/BaseActivity.java
@@ -48,16 +48,6 @@ public abstract class BaseActivity extends AppCompatActivity {
 		}
 	}
 
-	@Override
-	public void onPostCreate(Bundle savedInstanceState) {
-		super.onPostCreate(savedInstanceState);
-		// Post call used for controllers to ensure that the onCreate method
-		// override in inherited Activities has finished
-//		for (ActivityLifecycleController alc : lifecycleControllers) {
-//			alc.onActivityCreate();
-//		}
-	}
-
 	@Override
 	protected void onResume() {
 		super.onResume();
diff --git a/briar-android/src/org/briarproject/android/BriarActivity.java b/briar-android/src/org/briarproject/android/BriarActivity.java
index fca3fd12d..901a04e42 100644
--- a/briar-android/src/org/briarproject/android/BriarActivity.java
+++ b/briar-android/src/org/briarproject/android/BriarActivity.java
@@ -38,8 +38,6 @@ public abstract class BriarActivity extends BaseActivity {
 	@Override
 	public void onCreate(Bundle state) {
 		super.onCreate(state);
-
-		briarController.startAndBindService();
 	}
 
 	@Override
diff --git a/briar-android/src/org/briarproject/android/BriarService.java b/briar-android/src/org/briarproject/android/BriarService.java
index 6055c2d69..33d69c8f6 100644
--- a/briar-android/src/org/briarproject/android/BriarService.java
+++ b/briar-android/src/org/briarproject/android/BriarService.java
@@ -180,7 +180,7 @@ public class BriarService extends Service {
 
 	/** Starts the shutdown process. */
 	public void shutdown() {
-		stopSelf(); // This will call onActivityDestroy()
+		stopSelf(); // This will call onDestroy()
 	}
 
 	public class BriarBinder extends Binder {
diff --git a/briar-android/src/org/briarproject/android/controller/BriarController.java b/briar-android/src/org/briarproject/android/controller/BriarController.java
index 342e19359..2ed024ee9 100644
--- a/briar-android/src/org/briarproject/android/controller/BriarController.java
+++ b/briar-android/src/org/briarproject/android/controller/BriarController.java
@@ -8,8 +8,6 @@ public interface BriarController extends ActivityLifecycleController {
 
 	void startAndBindService();
 
-	void unbindService();
-
 	boolean encryptionKey();
 
 	void signOut(ResultHandler<Void> eventHandler);
diff --git a/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java b/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java
index 59ed95d3b..b959d66e8 100644
--- a/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java
+++ b/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java
@@ -45,6 +45,7 @@ public class BriarControllerImp implements BriarController {
 	@Override
 	@CallSuper
 	public void onActivityCreate() {
+		LOG.info("onActivityCreate : " + databaseConfig.getEncryptionKey());
 		if (databaseConfig.getEncryptionKey() != null) startAndBindService();
 	}
 
@@ -97,7 +98,7 @@ public class BriarControllerImp implements BriarController {
 		}.start();
 	}
 
-	public void unbindService() {
+	private void unbindService() {
 		if (bound) activity.unbindService(serviceConnection);
 	}