diff --git a/src/boot/routes.js b/src/boot/routes.js
index 2adbb928..0165ef6f 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -20,21 +20,6 @@ export default ({ app, router, store }) => {
                 next()
             }
         } else {
-            /* ==== A VOIR ===== if (to.fullPath === '/user/fax-settings') {
-                if (store.getters['user/hasFaxCapability']) {
-                    next()
-                } else {
-                    next('/')
-                }
-            } else if (to.fullPath === '/user/customer/*') {
-                if (store.getters['user/isOldCSCProxyingAllowed']) {
-                    next()
-                } else {
-                    next('/')
-                }
-            } else {
-                next()
-            } */
             // already authorized user
             switch (to.path) {
             case '/login':
diff --git a/src/components/CscMainMenuTop.vue b/src/components/CscMainMenuTop.vue
index bd4eb1f9..a3303bd0 100644
--- a/src/components/CscMainMenuTop.vue
+++ b/src/components/CscMainMenuTop.vue
@@ -204,13 +204,6 @@ export default {
                     label: this.$t('Extension Settings'),
                     visible: this.isPbxEnabled && this.hasSubscriberProfileAttributes(PROFILE_ATTRIBUTES_MAP.pbxSettings),
                     children: [
-                        // Just hide the page to re-use later
-                        // {
-                        //     to: '/user/extension-settings/general',
-                        //     icon: 'settings',
-                        //     label: this.$t('General'),
-                        //     visible: this.isPbxEnabled
-                        // },
                         {
                             to: '/user/extension-settings/call-queues',
                             icon: 'filter_none',
diff --git a/src/components/CscPage.vue b/src/components/CscPage.vue
index 6c4e8add..c28b76b4 100644
--- a/src/components/CscPage.vue
+++ b/src/components/CscPage.vue
@@ -47,24 +47,3 @@ export default {
     }
 }
 </script>
-
-<!--<style lang="sass" rel="stylesheet/sass">-->
-<!--    .csc-page-->
-<!--        min-height 100vh-->
-<!--        position relative-->
-<!--        margin 0-->
-<!--        padding 0-->
-<!--        .csc-page-content-->
-<!--            min-height 100vh-->
-<!--            padding $flex-gutter-lg-->
-<!--            padding-top 24px-->
-<!--            padding-bottom $call-footer-height-->
-<!--    .csc-page.csc-page-mobile-->
-<!--        .csc-page-content-->
-<!--            padding-left $flex-gutter-sm * 1.4-->
-<!--            padding-right $flex-gutter-sm * 1.4-->
-<!--    .csc-page.csc-page-mobile.csc-page-list-->
-<!--        .csc-page-content-->
-<!--            padding-left 0-->
-<!--            padding-right 0-->
-<!--</style>-->
diff --git a/src/components/pages/PbxConfiguration/CscPbxModelSelect.vue b/src/components/pages/PbxConfiguration/CscPbxModelSelect.vue
index c33cf9a1..435f3fdd 100644
--- a/src/components/pages/PbxConfiguration/CscPbxModelSelect.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxModelSelect.vue
@@ -71,90 +71,6 @@
             />
         </template>
     </q-select>
-    <!--    <div class="csc-pbx-model-select row items-end xs-gutter">-->
-    <!--        <div-->
-    <!--            v-if="selectedProfile !== null"-->
-    <!--            class="col-auto"-->
-    <!--        >-->
-    <!--            <q-icon-->
-    <!--                v-if="selectedProfileImageUrl === null"-->
-    <!--                class="csc-pbx-device-model-icon"-->
-    <!--                size="24px"-->
-    <!--                name="fa-fax"-->
-    <!--                color="white"-->
-    <!--            />-->
-    <!--            <div-->
-    <!--                v-else-->
-    <!--                class="csc-pbx-device-model-image"-->
-    <!--            >-->
-    <!--                <img-->
-    <!--                    :src="selectedProfileImageUrl"-->
-    <!--                >-->
-    <!--            </div>-->
-    <!--        </div>-->
-    <!--        <div-->
-    <!--            class="col-grow"-->
-    <!--        >-->
-    <!--            <q-input-->
-    <!--                readonly-->
-    <!--                class="cursor-pointer"-->
-    <!--                label="Device Model"-->
-    <!--                :value="selectedProfileName"-->
-    <!--                :disable="disable"-->
-    <!--            />-->
-    <!--        </div>-->
-    <!--        <q-menu-->
-    <!--            ref="popover"-->
-    <!--            fit-->
-    <!--            @open="$emit('opened')"-->
-    <!--        >-->
-    <!--            <q-list>-->
-    <!--                <q-item-->
-    <!--                    v-for="profileItem in profiles"-->
-    <!--                    :key="profileItem.id"-->
-    <!--                    class="cursor-pointer"-->
-    <!--                    @click="selectProfile(profileItem)"-->
-    <!--                >-->
-    <!--                    <q-item-section-->
-    <!--                        v-if="!modelImageMap[profileItem.device_id]"-->
-    <!--                        side-->
-    <!--                    >-->
-    <!--                        <q-icon-->
-    <!--                            size="24px"-->
-    <!--                            name="fax"-->
-    <!--                            color="white"-->
-    <!--                        />-->
-    <!--                    </q-item-section>-->
-    <!--                    <q-item-section-->
-    <!--                        v-else-->
-    <!--                        side-->
-    <!--                        avatar-->
-    <!--                    >-->
-    <!--                        <img-->
-    <!--                            :src="modelImageMap[profileItem.device_id].url"-->
-    <!--                        >-->
-    <!--                    </q-item-section>-->
-    <!--                    <q-item-section>-->
-    <!--                        <q-item-label>-->
-    <!--                            {{ profileItem.name }}-->
-    <!--                        </q-item-label>-->
-    <!--                    </q-item-section>-->
-    <!--                </q-item>-->
-    <!--            </q-list>-->
-    <!--        </q-menu>-->
-    <!--        <div-->
-    <!--            class="col-auto"-->
-    <!--        >-->
-    <!--            <q-btn-->
-    <!--                v-if="selectedProfile !== null && hasResetButton"-->
-    <!--                icon="clear"-->
-    <!--                color="white"-->
-    <!--                flat-->
-    <!--                small-->
-    <!--                @click="resetProfile"-->
-    <!--            />-->
-    <!--        </div>-->
-    <!--    </div>-->
 </template>
 
 <script>
diff --git a/src/pages/CscPagePbxGroups.vue b/src/pages/CscPagePbxGroups.vue
index 9e39956c..304327c3 100644
--- a/src/pages/CscPagePbxGroups.vue
+++ b/src/pages/CscPagePbxGroups.vue
@@ -81,9 +81,6 @@
         <csc-list-spinner
             v-if="isGroupListRequesting && !(isGroupCreating || isGroupRemoving || isGroupUpdating)"
         />
-        <!-- <csc-list
-            v-if="!isGroupListEmpty && groupListVisibility === 'visible'"
-        > -->
         <q-list
             v-if="!isGroupListEmpty && groupListVisibility === 'visible'"
             class="row justify-start items-start"
@@ -105,7 +102,6 @@
                     @remove="openGroupRemovalDialog(group.id)"
                 />
             </csc-fade>
-        <!-- </csc-list> -->
         </q-list>
         <div
             v-if="isGroupListEmpty && !isGroupListRequesting && hasFilters"
diff --git a/src/pages/CscPagePbxSeatDetails.vue b/src/pages/CscPagePbxSeatDetails.vue
index 33274230..c1225022 100644
--- a/src/pages/CscPagePbxSeatDetails.vue
+++ b/src/pages/CscPagePbxSeatDetails.vue
@@ -549,7 +549,6 @@ export default {
     async mounted () {
         this.selectSeat(this.id)
         await this.loadAnnouncements()
-        // await this.getNcosLevelsSubscriber()
         await this.getNcosSetSubscriber()
     },
     beforeUnmount () {
diff --git a/src/pages/CscPageSpeedDial.vue b/src/pages/CscPageSpeedDial.vue
index 91f36baa..2e4b6887 100644
--- a/src/pages/CscPageSpeedDial.vue
+++ b/src/pages/CscPageSpeedDial.vue
@@ -135,29 +135,6 @@ export default {
         ])
     },
     watch: {
-        // speedDialLoadingState (state) {
-        //     if (state === 'requesting') {
-        //         startLoading()
-        //     } else if (state === 'failed') {
-        //         stopLoading()
-        //         showGlobalError(this.speedDialLoadingError)
-        //     } else if (state === 'succeeded') {
-        //         stopLoading()
-        //     }
-        // },
-        // unassignSlotState (state) {
-        //     if (state === 'requesting') {
-        //         startLoading()
-        //     } else if (state === 'failed') {
-        //         stopLoading()
-        //         showGlobalError(this.unassignSlotError)
-        //     } else if (state === 'succeeded') {
-        //         stopLoading()
-        //         showToast(this.$t('Unassigned slot {slot}', {
-        //             slot: this.lastUnassignedSlot
-        //         }))
-        //     }
-        // },
         assignSlotState (state) {
             if (state === 'failed') {
                 showGlobalError(this.assignSlotError)
diff --git a/src/router/routes.js b/src/router/routes.js
index 86e2b8a3..98b6051f 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -21,8 +21,6 @@ import CscPagePbxCallQueues from 'src/pages/CscPagePbxCallQueues'
 import CscPagePbxSoundSets from 'src/pages/CscPagePbxSoundSets'
 import CscPagePbxMsConfigs from 'src/pages/CscPagePbxMsConfigs'
 import CscPagePbxAutoAttendant from 'src/pages/CscPagePbxAutoAttendant'
-// Just hide the page to re-use later
-// import CscPagePbxSettings from 'src/pages/CscPagePbxSettings'
 import CscPageVoicebox from 'src/pages/CscPageVoicebox'
 import CscPageFaxSettings from 'src/pages/CscPageFaxSettings'
 import CscPageUserSettings from 'src/pages/CscPageUserSettings'
@@ -380,19 +378,6 @@ const routes = [
                     profileAttributes: PROFILE_ATTRIBUTES_MAP.callSettings
                 }
             },
-            // Just hide the page to re-use later
-            // {
-            //     path: 'extension-settings/general',
-            //     component: CscPagePbxSettings,
-            //     meta: {
-            //         get title () {
-            //             return i18n.global.tc('Extension Settings')
-            //         },
-            //         get subtitle () {
-            //             return i18n.global.tc('Set your Extension settings')
-            //         },
-            //     }
-            // },
             {
                 path: 'extension-settings/call-queues',
                 component: CscPagePbxSettingsCallQueues,