diff --git a/.eslintignore b/.eslintignore
index cbc861134..3389f1dad 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -32,4 +32,3 @@ ts/**/*.js
 # Libloki specific files
 libloki/test/components.js
 libloki/modules/mnemonic.js
-session-file-server/**
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index ee7610304..f14d51fd1 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -20,9 +20,6 @@ jobs:
       - name: Checkout git repo
         uses: actions/checkout@v2
 
-      - name: Pull git submodules
-        run: git submodule update --init
-
       - name: Install node
         uses: actions/setup-node@v1
         with:
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index fa5c758b0..1ce275553 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -22,9 +22,6 @@ jobs:
       - name: Checkout git repo
         uses: actions/checkout@v2
 
-      - name: Pull git submodules
-        run: git submodule update --init
-
       - name: Install node
         uses: actions/setup-node@v1
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e7fdfd45b..fa58a83fa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,9 +20,6 @@ jobs:
       - name: Checkout git repo
         uses: actions/checkout@v2
 
-      - name: Pull git submodules
-        run: git submodule update --init
-
       - name: Install node
         uses: actions/setup-node@v1
         with:
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 69117c0be..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "session-file-server"]
-	path = session-file-server
-	url = https://github.com/loki-project/session-file-server/
-	branch = session
diff --git a/.prettierignore b/.prettierignore
index b8d49a937..6d510d168 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -49,5 +49,4 @@ stylesheets/_intlTelInput.scss
 # Coverage
 coverage/**
 .nyc_output/**
-session-file-server/**
 release/**
diff --git a/tools/unusedLocalizedString.py b/tools/unusedLocalizedString.py
index 32d1dd2b3..9c0cbec12 100755
--- a/tools/unusedLocalizedString.py
+++ b/tools/unusedLocalizedString.py
@@ -13,8 +13,8 @@ files = [y for x in os.walk(dir_path) for y in glob(os.path.join(x[0], '*.js'))]
 files += [y for x in os.walk(dir_path) for y in glob(os.path.join(x[0], '*.ts'))]
 files += [y for x in os.walk(dir_path) for y in glob(os.path.join(x[0], '*.tsx'))]
 
-# exclude node_modules and session-file-server directories
-filtered_files = [f for f in files if "node_modules" not in f and "session-file-server" not in f]
+# exclude node_modules directories
+filtered_files = [f for f in files if "node_modules" not in f]
 
 # search for this pattern in _locales/en/messages.json: it is a defined localized string
 patternLocalizedString = re.compile("^  \".*\"\: {")