diff --git a/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt b/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt
index 4a909e4775..157acb99c2 100644
--- a/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt
+++ b/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt
@@ -26,6 +26,7 @@ import com.nextcloud.client.account.CurrentAccountProvider
 import com.nextcloud.client.preferences.AppPreferences
 import com.owncloud.android.BuildConfig
 import com.owncloud.android.R
+import com.owncloud.android.authentication.AuthenticatorActivity
 import com.owncloud.android.features.FeatureItem
 import com.owncloud.android.ui.activity.PassCodeActivity
 
diff --git a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
index d56ac72153..b0974d1eb4 100644
--- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -86,7 +86,6 @@ import com.owncloud.android.ui.activities.ActivitiesActivity;
 import com.owncloud.android.ui.events.AccountRemovedEvent;
 import com.owncloud.android.ui.events.ChangeMenuEvent;
 import com.owncloud.android.ui.events.DummyDrawerEvent;
-import com.owncloud.android.ui.events.MenuItemClickEvent;
 import com.owncloud.android.ui.events.SearchEvent;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
 import com.owncloud.android.ui.trashbin.TrashbinActivity;
@@ -385,23 +384,6 @@ public abstract class DrawerActivity extends ToolbarActivity
         DrawerMenuUtil.removeMenuItem(menu, R.id.nav_logout, !getResources().getBoolean(R.bool.show_drawer_logout));
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(MenuItemClickEvent event) {
-        unsetAllDrawerMenuItems();
-
-        switch (event.menuItem.getItemId()) {
-            case R.id.nav_bar_files:
-                showFiles(false);
-                break;
-            case R.id.nav_bar_settings:
-                Intent settingsIntent = new Intent(getApplicationContext(), SettingsActivity.class);
-                startActivity(settingsIntent);
-                break;
-            default:
-                break;
-        }
-    }
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(DummyDrawerEvent event) {
         unsetAllDrawerMenuItems();