diff --git a/.gitmodules b/.gitmodules
index 368c3d590b7814a2dd784bf3dfc5412e98274521..a1d08b87b3c74ea875c6707f8b83bf58d1230585 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,30 +1,18 @@
 [submodule "client-android"]
 	path = client-android
 	url = https://review.jami.net/jami-client-android
-[submodule "client-gnome"]
-	path = client-gnome
-	url = https://review.jami.net/jami-client-gnome
 [submodule "daemon"]
 	path = daemon
 	url = https://review.jami.net/jami-daemon
-[submodule "lrc"]
-	path = lrc
-	url = https://review.jami.net/jami-libclient
 [submodule "client-macosx"]
 	path = client-macosx
 	url = https://review.jami.net/jami-client-macos
 [submodule "client-ios"]
 	path = client-ios
 	url = https://review.jami.net/jami-client-ios
-[submodule "client-uwp"]
-	path = client-uwp
-	url = https://review.jami.net/jami-client-uwp
 [submodule "client-qt"]
 	path = client-qt
 	url = https://review.jami.net/jami-client-qt
 [submodule "plugins"]
 	path = plugins
 	url = https://review.jami.net/jami-plugins
-[submodule "lrc-gnome"]
-	path = lrc-gnome
-	url = https://review.jami.net/jami-libclient
diff --git a/Jenkinsfile b/Jenkinsfile
index b377394bf6f9234be7ff4a77a18bed214d386cdf..b0d0750e3fdc3692bd67a86dc55d35a7990c0093 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@
 // - Allow publishing from any node, to avoid relying on a single machine.
 
 // Configuration globals.
-def SUBMODULES = ['daemon', 'lrc', 'client-qt']
+def SUBMODULES = ['daemon', 'client-qt']
 def TARGETS = [:]
 def REMOTE_HOST = env.SSH_HOST_DL_RING_CX
 def REMOTE_BASE_DIR = '/srv/repository/ring'
@@ -138,8 +138,8 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
                 sh """git checkout ${params.CHANNEL}
                       git reset --hard origin/${params.CHANNEL}
                       # Submodules are generally not managed by merging
-                      git merge -X theirs --no-commit FETCH_HEAD
                       git status
+                      git merge -X theirs --no-commit FETCH_HEAD
                    """
             }
         }
diff --git a/build.py b/build.py
index 918896e232f7d1dd9b882ae9db22633a4dada9b0..18a89489b3339b65a5d8aa71c8388a18634a5286 100755
--- a/build.py
+++ b/build.py
@@ -395,7 +395,7 @@ def run_init():
     for name in module_names:
         copy_file("./scripts/commit-msg", ".git/modules/"+name+"/hooks")
 
-    module_names_to_format = ['daemon', 'lrc', 'client-qt', 'plugins']
+    module_names_to_format = ['daemon', 'client-qt', 'plugins']
     for name in module_names_to_format:
         execute_script(
             ['./scripts/format.sh --install  %(path)s'],
diff --git a/client-gnome b/client-gnome
deleted file mode 160000
index d493e44ff3fd106456df85d0e73f6b3c08ecd38c..0000000000000000000000000000000000000000
--- a/client-gnome
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d493e44ff3fd106456df85d0e73f6b3c08ecd38c
diff --git a/client-uwp b/client-uwp
deleted file mode 160000
index 4b639e9a903931bab09292b4d93a4de6d531ae4c..0000000000000000000000000000000000000000
--- a/client-uwp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4b639e9a903931bab09292b4d93a4de6d531ae4c
diff --git a/lrc b/lrc
deleted file mode 160000
index 48db64cbcd3a8d7a12cad940694ce9239b8db576..0000000000000000000000000000000000000000
--- a/lrc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 48db64cbcd3a8d7a12cad940694ce9239b8db576
diff --git a/lrc-gnome b/lrc-gnome
deleted file mode 160000
index 74fcb074357421dad30181ee5b46cebd79166ca9..0000000000000000000000000000000000000000
--- a/lrc-gnome
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 74fcb074357421dad30181ee5b46cebd79166ca9
diff --git a/packaging/rules/snap/jami/snapcraft.yaml b/packaging/rules/snap/jami/snapcraft.yaml
index 0fc789f62384998b69698d40b0c8f6f7f4651659..7a5f7806a81f7245c0a3dcb562fdb63996e9cce0 100644
--- a/packaging/rules/snap/jami/snapcraft.yaml
+++ b/packaging/rules/snap/jami/snapcraft.yaml
@@ -243,8 +243,6 @@ parts:
       - -usr/share/doc/libldap-common/changelog.Debian.gz
     build-environment:
       - QT_BASE_DIR: "/usr/lib/libqt-jami"
-      - QTDIR: "$QT_BASE_DIR"
-      - QTVER: "6.2.0"
       - PATH: "$QT_BASE_DIR/bin:$PATH"
       - LD_LIBRARY_PATH: "$QT_BASE_DIR/lib:$LD_LIBRARY_PATH"
       - PKG_CONFIG_PATH: "$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH"
@@ -286,11 +284,10 @@ parts:
       cd $SNAPCRAFT_PART_BUILD/client-qt
       mkdir build
       cd build
-      cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-               -DCMAKE_PREFIX_PATH=$SNAPCRAFT_PART_INSTALL/usr \
-               -DENABLE_STATIC=true -DENABLE_LIBWRAP=true \ \
+      cmake .. -DENABLE_LIBWRAP=true \
                -DLIBJAMI_BUILD_DIR=$SNAPCRAFT_PART_BUILD/daemon/src \
-               -DQT6_VER=$QTVER -DQT6_PATH=$QTDIR
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DCMAKE_BUILD_TYPE=Release
       make -j$SNAPCRAFT_PARALLEL_BUILD_COUNT
       DESTDIR=$SNAPCRAFT_PART_INSTALL make install
     build-packages: