diff --git a/Makefile b/Makefile
index 21c3bf4..95fd274 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
 .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
 .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
-.PHONY: clean undo_setup fixup
+.PHONY: clean
 
 CFGDIR ?= configs/sc
 
@@ -166,11 +166,3 @@ clean:
 	rm -rf element-web/dist
 	rm -rf local-pkgbuild
 	rm -f bom.lock
-
-undo_setup:
-	rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak
-
-fixup: undo_setup
-	make setup
-	make clean
-	make setup
diff --git a/README.md b/README.md
index 9b1ea85..f4d437d 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ The following are the dependencies required to build SchildiChat Web/Desktop on
 ```
 # apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools openssl libssl-dev tcl
 
-# curl -sL https://deb.nodesource.com/setup_16.x | bash -
+# curl -sL https://deb.nodesource.com/setup_14.x | bash -
 # apt update
 # apt install nodejs
 
diff --git a/element-desktop b/element-desktop
index acf7d17..bb09b97 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit acf7d174d2e91294db6b5c450d8bda5b7fde68dc
+Subproject commit bb09b97684db6927539a57ac05356bb7b6dffad3
diff --git a/element-web b/element-web
index 183a165..2a51d27 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 183a16501659bbd0f9a8178ebaa2c5a0ea252db5
+Subproject commit 2a51d277c7bc83b1b001d1aae50574bfb812d488
diff --git a/generate_changelog.sh b/generate_changelog.sh
deleted file mode 100755
index 3bca794..0000000
--- a/generate_changelog.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mydir="$(dirname "$(realpath "$0")")"
-
-pushd "$mydir" > /dev/null
-
-source ./merge_helpers.sh
-
-# Check branch
-check_branch $branch
-forall_repos check_branch $branch
-
-# Ensure clean git state
-forall_repos check_clean_git
-
-# Fetch upstream
-forall_repos git fetch origin > /dev/null
-forall_repos git fetch upstream > /dev/null
-
-(
-    # Add new line below git log: https://unix.stackexchange.com/a/345558
-
-    get_latest_upstream_tag
-    forelement_repos git log --pretty=format:"- %s" "sc" "^$latest_upstream_tag" "^master" \
-        | printf '%s\n' "$(cat)" \
-        | sed "s|Merge tag '\\(.*\\)' into sc.*|Update codebase to Element \1|" \
-        | sed "s|Merge tag '\\(.*\\)' into merge.*|Update codebase to Element \1|"
-
-    get_current_mxsdk_tags
-
-    pushd "matrix-js-sdk" > /dev/null
-    git log --pretty=format:"- %s" "sc" "^$current_mxjssdk_tag" "^master" \
-        | printf '%s\n' "$(cat)" \
-        | grep -v "Merge .*tag"
-    popd > /dev/null
-
-    pushd "matrix-react-sdk" > /dev/null
-    git log --pretty=format:"- %s" "sc" "^$current_mxreactsdk_tag" "^master" \
-        | printf '%s\n' "$(cat)" \
-        | grep -v "Merge .*tag"
-    popd > /dev/null
-) \
-    | grep -v "Automatic i18n reversion" \
-    | grep -v "Automatic package.json reversion" \
-    | grep -v "Merge .*branch" \
-    | grep -v "Automatic theme update" \
-    | grep -v "Automatic package.json adjustment" \
-    | grep -v "Automatic i18n adjustment" \
-    | grep -v "Update version to .*-sc\\..*" \
-    | grep -v "\\.sh" \
-    | grep -v "\\.md" \
-    | grep -v "Added translation using Weblate" \
-    | grep -v "Translated using Weblate" \
-    | grep -v "weblate/sc" \
-    | grep -v "\\[.*merge.*\\]" \
-    | awk '!seen[$0]++' `# https://stackoverflow.com/a/1444448` \
-    || echo "No significant changes since the last stable release"
-
-popd > /dev/null
diff --git a/matrix-js-sdk b/matrix-js-sdk
index e944aac..c2deb2a 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit e944aacab07f03fd8d13559243cbd240e4b7f2c3
+Subproject commit c2deb2a20e687b1ef566a3e21ae3c5c18b473dd1
diff --git a/matrix-react-sdk b/matrix-react-sdk
index a552159..bf34169 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit a55215909b7a1a526b2b11604f6327f2233232f2
+Subproject commit bf34169e576fde32cc9b0384eed22220b311ef39