diff --git a/app/src/main/java/com/nextcloud/talk/utils/remapchat/ConductorRemapping.kt b/app/src/main/java/com/nextcloud/talk/utils/remapchat/ConductorRemapping.kt
deleted file mode 100644
index ce212e433..000000000
--- a/app/src/main/java/com/nextcloud/talk/utils/remapchat/ConductorRemapping.kt
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Nextcloud Talk application
- *
- * @author Mario Danic
- * Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.nextcloud.talk.utils.remapchat
-
-object ConductorRemapping {
-
-    private val TAG = ConductorRemapping::class.simpleName
-
-    // fun remapChatController(
-    //     router: Router,
-    //     internalUserId: Long,
-    //     roomTokenOrId: String,
-    //     bundle: Bundle,
-    //     replaceTop: Boolean
-    // ) {
-    //     remapChatController(router, internalUserId, roomTokenOrId, bundle, replaceTop, false)
-    // }
-
-    // fun remapChatController(
-    //     router: Router,
-    //     internalUserId: Long,
-    //     roomTokenOrId: String,
-    //     bundle: Bundle,
-    //     replaceTop: Boolean,
-    //     pushImmediately: Boolean
-    // ) {
-    //     val chatControllerTag = "$internalUserId@$roomTokenOrId"
-    //
-    //     if (router.getControllerWithTag(chatControllerTag) != null) {
-    //         moveControllerToTop(router, chatControllerTag)
-    //     } else {
-    //         val pushChangeHandler = if (pushImmediately) {
-    //             SimpleSwapChangeHandler()
-    //         } else {
-    //             HorizontalChangeHandler()
-    //         }
-    //
-    //         if (router.hasRootController()) {
-    //             val backstack = router.backstack
-    //             val topController = backstack[router.backstackSize - 1].controller
-    //
-    //             val remapChatModel = RemapChatModel(
-    //                 router,
-    //                 pushChangeHandler,
-    //                 chatControllerTag,
-    //                 bundle
-    //             )
-    //
-    //             if (topController is ChatActivity) {
-    //                 if (replaceTop) {
-    //                     topController.leaveRoom(remapChatModel, this::replaceTopController)
-    //                 } else {
-    //                     topController.leaveRoom(remapChatModel, this::pushController)
-    //                 }
-    //             } else {
-    //                 if (replaceTop) {
-    //                     replaceTopController(remapChatModel)
-    //                 } else {
-    //                     pushController(remapChatModel)
-    //                 }
-    //             }
-    //         } else {
-    //             Log.d(TAG, "router has no RootController. creating backstack with ConversationsListController")
-    //             val newBackstack = listOf(
-    //                 RouterTransaction.with(ConversationsListController(Bundle()))
-    //                     .pushChangeHandler(HorizontalChangeHandler())
-    //                     .popChangeHandler(HorizontalChangeHandler()),
-    //                 RouterTransaction.with(ChatActivity(bundle))
-    //                     .pushChangeHandler(HorizontalChangeHandler())
-    //                     .popChangeHandler(HorizontalChangeHandler())
-    //                     .tag(chatControllerTag)
-    //             )
-    //             router.setBackstack(newBackstack, SimpleSwapChangeHandler())
-    //         }
-    //     }
-    //
-    //     if (router.getControllerWithTag(LockedController.TAG) != null) {
-    //         moveControllerToTop(router, LockedController.TAG)
-    //     }
-    // }
-    //
-    // fun pushController(remapChatModel: RemapChatModel) {
-    //     Log.d(TAG, "pushController")
-    //     remapChatModel.router.pushController(
-    //         RouterTransaction.with(ChatActivity(remapChatModel.bundle))
-    //             .pushChangeHandler(remapChatModel.controllerChangeHandler)
-    //             .popChangeHandler(HorizontalChangeHandler())
-    //             .tag(remapChatModel.chatControllerTag)
-    //     )
-    // }
-    //
-    // private fun replaceTopController(remapChatModel: RemapChatModel) {
-    //     Log.d(TAG, "replaceTopController")
-    //     remapChatModel.router.replaceTopController(
-    //         RouterTransaction.with(ChatActivity(remapChatModel.bundle))
-    //             .pushChangeHandler(remapChatModel.controllerChangeHandler)
-    //             .popChangeHandler(HorizontalChangeHandler())
-    //             .tag(remapChatModel.chatControllerTag)
-    //     )
-    // }
-    //
-    // private fun moveControllerToTop(router: Router, controllerTag: String) {
-    //     Log.d(TAG, "moving $controllerTag to top...")
-    //     val backstack = router.backstack
-    //     var routerTransaction: RouterTransaction? = null
-    //     for (i in 0 until router.backstackSize) {
-    //         if (controllerTag == backstack[i].tag()) {
-    //             routerTransaction = backstack[i]
-    //             backstack.remove(routerTransaction)
-    //             Log.d(TAG, "removed controller: " + routerTransaction.controller)
-    //             break
-    //         }
-    //     }
-    //
-    //     backstack.add(routerTransaction)
-    //     Log.d(TAG, "added controller to top: " + routerTransaction!!.controller)
-    //     router.setBackstack(backstack, HorizontalChangeHandler())
-    // }
-}