diff --git a/package-lock.json b/package-lock.json
index 9f9134b9a3..9c1d0d4535 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -74,7 +74,6 @@
         "karma-coverage-istanbul-reporter": "~3.0.3",
         "karma-jasmine": "~4.0.0",
         "karma-jasmine-html-reporter": "^1.5.4",
-        "ng-packagr": "^12.1.1",
         "protractor": "^7.0.0",
         "ts-node": "~8.9.0",
         "typescript": "4.3.5"
@@ -2835,6 +2834,8 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-20.0.0.tgz",
       "integrity": "sha512-5K0g5W2Ol8hAcTHqcTBHiA7M58tfmYi1o9KxeJuuRNpGaTa5iLjcyemBitCBcKXaHamOBBEH2dGom6v6Unmqjg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@rollup/pluginutils": "^3.1.0",
         "commondir": "^1.0.1",
@@ -2856,6 +2857,8 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz",
       "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@rollup/pluginutils": "^3.0.8"
       },
@@ -2868,6 +2871,8 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.6.tgz",
       "integrity": "sha512-sFsPDMPd4gMqnh2gS0uIxELnoRUp5kBl5knxD2EO0778G1oOJv4G1vyT2cpWz75OU2jDVcXhjVUuTAczGyFNKA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@rollup/pluginutils": "^3.1.0",
         "@types/resolve": "1.17.1",
@@ -2888,6 +2893,8 @@
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
       "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@types/estree": "0.0.39",
         "estree-walker": "^1.0.1",
@@ -2904,13 +2911,17 @@
       "version": "0.0.39",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
       "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/@rollup/pluginutils/node_modules/estree-walker": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
       "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/@schematics/angular": {
       "version": "12.2.13",
@@ -3338,6 +3349,8 @@
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
       "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -4903,6 +4916,8 @@
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
       "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=6"
       },
@@ -6417,7 +6432,9 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
       "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/custom-event": {
       "version": "1.0.1",
@@ -6861,6 +6878,8 @@
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
       "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8222,7 +8241,9 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/esutils": {
       "version": "2.0.3",
@@ -8935,7 +8956,9 @@
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.1.tgz",
       "integrity": "sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/find-up": {
       "version": "2.1.0",
@@ -10107,6 +10130,8 @@
       "resolved": "https://registry.npmjs.org/injection-js/-/injection-js-2.4.0.tgz",
       "integrity": "sha512-6jiJt0tCAo9zjHbcwLiPL+IuNe9SQ6a9g0PEzafThW3fOQi0mrmiJGBJvDD6tmhPh8cQHIQtCOrJuBfQME4kPA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "tslib": "^2.0.0"
       }
@@ -10507,7 +10532,9 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
       "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/is-negative-zero": {
       "version": "2.0.1",
@@ -10595,6 +10622,8 @@
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
       "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@types/estree": "*"
       }
@@ -12414,6 +12443,8 @@
       "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-12.2.5.tgz",
       "integrity": "sha512-iNxX8lgAMNYAfXDBJomD7SeFpG47uoyKkGCWQo78AlFS4q3fGiFEIRrX842MTuASshYVAqMaBkaKPOajPx7VXw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@rollup/plugin-commonjs": "^20.0.0",
         "@rollup/plugin-json": "^4.1.0",
@@ -12462,6 +12493,8 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
       "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">= 12"
       }
@@ -12473,6 +12506,7 @@
       "dev": true,
       "hasInstallScript": true,
       "optional": true,
+      "peer": true,
       "bin": {
         "esbuild": "bin/esbuild"
       }
@@ -12482,6 +12516,8 @@
       "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.12.29.tgz",
       "integrity": "sha512-amSuB/qOGnTFYLOxGHDGosQbOKZnrinniPHFf6ZxzeNH7WAjLkjXluKyKAtX2YuhTkUXm9XV9igl13iqYZ44fQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -12494,6 +12530,8 @@
       "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz",
       "integrity": "sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@rollup/pluginutils": "^3.0.9",
         "source-map-resolve": "^0.6.0"
@@ -12516,6 +12554,8 @@
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
       "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0"
@@ -12701,6 +12741,8 @@
       "resolved": "https://registry.npmjs.org/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz",
       "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "find-parent-dir": "^0.3.0"
       }
@@ -15820,6 +15862,8 @@
       "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-10.1.3.tgz",
       "integrity": "sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "make-dir": "~3.1.0",
         "mime": "~2.5.2",
@@ -15838,6 +15882,8 @@
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
       "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "bin": {
         "mime": "cli.js"
       },
@@ -16893,6 +16939,8 @@
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.60.0.tgz",
       "integrity": "sha512-cHdv9GWd58v58rdseC8e8XIaPUo8a9cgZpnCMMDGZFDZKEODOiPPEQFXLriWr/TjXzhPPmG5bkAztPsOARIcGQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -20576,6 +20624,8 @@
       "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz",
       "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "cuint": "^0.2.2"
       }
@@ -22626,6 +22676,8 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-20.0.0.tgz",
       "integrity": "sha512-5K0g5W2Ol8hAcTHqcTBHiA7M58tfmYi1o9KxeJuuRNpGaTa5iLjcyemBitCBcKXaHamOBBEH2dGom6v6Unmqjg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "@rollup/pluginutils": "^3.1.0",
         "commondir": "^1.0.1",
@@ -22641,6 +22693,8 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz",
       "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "@rollup/pluginutils": "^3.0.8"
       }
@@ -22650,6 +22704,8 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.6.tgz",
       "integrity": "sha512-sFsPDMPd4gMqnh2gS0uIxELnoRUp5kBl5knxD2EO0778G1oOJv4G1vyT2cpWz75OU2jDVcXhjVUuTAczGyFNKA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "@rollup/pluginutils": "^3.1.0",
         "@types/resolve": "1.17.1",
@@ -22664,6 +22720,8 @@
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
       "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "@types/estree": "0.0.39",
         "estree-walker": "^1.0.1",
@@ -22674,13 +22732,17 @@
           "version": "0.0.39",
           "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
           "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
-          "dev": true
+          "dev": true,
+          "optional": true,
+          "peer": true
         },
         "estree-walker": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
           "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-          "dev": true
+          "dev": true,
+          "optional": true,
+          "peer": true
         }
       }
     },
@@ -23099,6 +23161,8 @@
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
       "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "@types/node": "*"
       }
@@ -24298,7 +24362,9 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
       "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "builtins": {
       "version": "1.0.3",
@@ -25461,7 +25527,9 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
       "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "custom-event": {
       "version": "1.0.1",
@@ -25869,7 +25937,9 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
       "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "default-gateway": {
       "version": "4.2.0",
@@ -26893,7 +26963,9 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "esutils": {
       "version": "2.0.3",
@@ -27470,7 +27542,9 @@
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.1.tgz",
       "integrity": "sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "find-up": {
       "version": "2.1.0",
@@ -28390,6 +28464,8 @@
       "resolved": "https://registry.npmjs.org/injection-js/-/injection-js-2.4.0.tgz",
       "integrity": "sha512-6jiJt0tCAo9zjHbcwLiPL+IuNe9SQ6a9g0PEzafThW3fOQi0mrmiJGBJvDD6tmhPh8cQHIQtCOrJuBfQME4kPA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "tslib": "^2.0.0"
       }
@@ -28687,7 +28763,9 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
       "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "is-negative-zero": {
       "version": "2.0.1",
@@ -28748,6 +28826,8 @@
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
       "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "@types/estree": "*"
       }
@@ -30162,6 +30242,8 @@
       "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-12.2.5.tgz",
       "integrity": "sha512-iNxX8lgAMNYAfXDBJomD7SeFpG47uoyKkGCWQo78AlFS4q3fGiFEIRrX842MTuASshYVAqMaBkaKPOajPx7VXw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "@rollup/plugin-commonjs": "^20.0.0",
         "@rollup/plugin-json": "^4.1.0",
@@ -30196,26 +30278,33 @@
           "version": "8.3.0",
           "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
           "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-          "dev": true
+          "dev": true,
+          "optional": true,
+          "peer": true
         },
         "esbuild": {
           "version": "0.12.29",
           "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.29.tgz",
           "integrity": "sha512-w/XuoBCSwepyiZtIRsKsetiLDUVGPVw1E/R3VTFSecIy8UR7Cq3SOtwKHJMFoVqqVG36aGkzh4e8BvpO1Fdc7g==",
           "dev": true,
-          "optional": true
+          "optional": true,
+          "peer": true
         },
         "esbuild-wasm": {
           "version": "0.12.29",
           "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.12.29.tgz",
           "integrity": "sha512-amSuB/qOGnTFYLOxGHDGosQbOKZnrinniPHFf6ZxzeNH7WAjLkjXluKyKAtX2YuhTkUXm9XV9igl13iqYZ44fQ==",
-          "dev": true
+          "dev": true,
+          "optional": true,
+          "peer": true
         },
         "rollup-plugin-sourcemaps": {
           "version": "0.6.3",
           "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz",
           "integrity": "sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "@rollup/pluginutils": "^3.0.9",
             "source-map-resolve": "^0.6.0"
@@ -30226,6 +30315,8 @@
           "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
           "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "atob": "^2.1.2",
             "decode-uri-component": "^0.2.0"
@@ -30376,6 +30467,8 @@
       "resolved": "https://registry.npmjs.org/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz",
       "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "find-parent-dir": "^0.3.0"
       }
@@ -32697,6 +32790,8 @@
       "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-10.1.3.tgz",
       "integrity": "sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "make-dir": "~3.1.0",
         "mime": "~2.5.2",
@@ -32708,7 +32803,9 @@
           "version": "2.5.2",
           "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
           "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
-          "dev": true
+          "dev": true,
+          "optional": true,
+          "peer": true
         }
       }
     },
@@ -33514,6 +33611,8 @@
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.60.0.tgz",
       "integrity": "sha512-cHdv9GWd58v58rdseC8e8XIaPUo8a9cgZpnCMMDGZFDZKEODOiPPEQFXLriWr/TjXzhPPmG5bkAztPsOARIcGQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "fsevents": "~2.3.2"
       }
@@ -36393,6 +36492,8 @@
       "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz",
       "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "cuint": "^0.2.2"
       }
diff --git a/src/app/main/dialog/dialog.component.html b/src/app/main/dialog/dialog.component.html
index 43a4c0cd32..4b9400a6e5 100644
--- a/src/app/main/dialog/dialog.component.html
+++ b/src/app/main/dialog/dialog.component.html
@@ -102,9 +102,9 @@
         <app-project-form [projectCode]="data.project" (closeDialog)="dialogRef.close()"></app-project-form>
     </div>
 
-    <!-- Delete project -->
-    <div *ngSwitchCase="'deleteProject'">
-        <app-dialog-header [title]="data.name" [subtitle]="'appLabels.form.project.title.delete' | translate">
+    <!-- Deactivate project -->
+    <div *ngSwitchCase="'deactivateProject'">
+        <app-dialog-header [title]="data.name" [subtitle]="'appLabels.form.project.title.deactivate' | translate">
         </app-dialog-header>
         Do you want to deactivate this project?
         <mat-dialog-actions>
diff --git a/src/app/system/projects/projects-list/projects-list.component.html b/src/app/system/projects/projects-list/projects-list.component.html
index f8f1bc3d43..06b720c003 100644
--- a/src/app/system/projects/projects-list/projects-list.component.html
+++ b/src/app/system/projects/projects-list/projects-list.component.html
@@ -79,7 +79,7 @@ <h5 class="mat-subheading-2 link info-longname" (click)="openProjectPage(project
                     - http://www.knora.org/ontology/knora-admin#DefaultSharedOntologiesProject
                     -->
                     <button mat-menu-item *ngIf="status"
-                        (click)="openDialog('deleteProject', project.shortname, project.id)">
+                        (click)="openDialog('deactivateProject', project.shortname, project.id)">
                         Deactivate project
                     </button>
                     <button mat-menu-item *ngIf="!status"
diff --git a/src/app/system/projects/projects-list/projects-list.component.ts b/src/app/system/projects/projects-list/projects-list.component.ts
index 5afb83475b..cf4a8f301b 100644
--- a/src/app/system/projects/projects-list/projects-list.component.ts
+++ b/src/app/system/projects/projects-list/projects-list.component.ts
@@ -156,8 +156,8 @@ export class ProjectsListComponent implements OnInit {
             if (response === true) {
                 // get the mode
                 switch (mode) {
-                    case 'deleteProject':
-                        this.deleteProject(id);
+                    case 'deactivateProject':
+                        this.deactivateProject(id);
                         break;
 
                     case 'activateProject':
@@ -180,7 +180,8 @@ export class ProjectsListComponent implements OnInit {
         localStorage.setItem('sortProjectsBy', key);
     }
 
-    deleteProject(id: string) {
+    deactivateProject(id: string) {
+        // the deleteProject() method in js-lib sets the project's status to false, it is not actually deleted
         this._dspApiConnection.admin.projectsEndpoint.deleteProject(id).subscribe(
             (response: ApiResponseData<ProjectResponse>) => {
                 this.refreshParent.emit();
diff --git a/src/app/system/projects/projects.component.html b/src/app/system/projects/projects.component.html
index ec461abc7f..e23cc73f38 100644
--- a/src/app/system/projects/projects.component.html
+++ b/src/app/system/projects/projects.component.html
@@ -1,16 +1,3 @@
-<!--
-<form [formGroup]="findProject" class="form" *ngIf="!loading">
-    <mat-form-field class="large">
-        <input matInput [placeholder]="Find project…" [formControl]="">
-    </mat-form-field>
-    <mat-autocomplete #user="matAutocomplete" (optionSelected)="selectProject()">
-            <mat-option *ngFor="let project of filteredProjects | async" [value]="project?.name">
-                {{ project?.label }}
-            </mat-option>
-        </mat-autocomplete>
-</form>
- -->
-
 <app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
 <div *ngIf="!loading" class="app-projects">
@@ -22,14 +9,3 @@
     <app-projects-list [list]="inactive" [status]="false" (refreshParent)="refresh()"></app-projects-list>
 </div>
 
-<!--
-<div *ngIf="system">
-
-    <button mat-raised-button [color]="'primary'" class="add-new" (click)="openDialog('createProject')">
-            NEW project
-    </button>
-    <app-progress-indicator *ngIf="loadSystem"></app-progress-indicator>
-    <app-projects-list *ngIf="!loadSystem" [list]="active" [system]="system"></app-projects-list>
-    <app-projects-list *ngIf="!loadSystem" [list]="inactive" [system]="system"></app-projects-list>
-</div>
- -->
diff --git a/src/app/system/projects/projects.component.ts b/src/app/system/projects/projects.component.ts
index ee0c37941d..7731c67341 100644
--- a/src/app/system/projects/projects.component.ts
+++ b/src/app/system/projects/projects.component.ts
@@ -83,10 +83,9 @@ export class ProjectsComponent implements OnInit {
         // clean up list of projects
         this.active = [];
         this.inactive = [];
-
         if (this.username) {
             // logged-in user view: get all projects, where the user is member of
-            this._cache.get(this.username, this._dspApiConnection.admin.usersEndpoint.getUserByUsername(this.username)).subscribe(
+            this._dspApiConnection.admin.usersEndpoint.getUserByUsername(this.username).subscribe(
                 (response: ApiResponseData<UserResponse>) => {
 
                     for (const project of response.body.user.projects) {
@@ -154,17 +153,8 @@ export class ProjectsComponent implements OnInit {
      * refresh list of projects after updating one
      */
     refresh(): void {
-        // referesh the component
+        // refresh the component
         this.loading = true;
-        // update the cache
-        // this._cache.del('members_of_' + this.projectCode);
         this.initList();
-
-        // refresh child component: add user
-        /*
-        if (this.addUser) {
-            this.addUser.buildForm();
-        }
-        */
     }
 }
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 856645f3d9..24e592407f 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -97,8 +97,8 @@
                     "new": "Projekt erstellen",
                     "edit": "Projekt aktualisieren",
                     "editSuccess": "Das Projekt wurde erfolgreich aktualisiert",
-                    "delete": "Projekt deaktivieren",
-                    "deleteHint": "Möchtest du das Projekt wirklich deaktivieren?",
+                    "deactivate": "Projekt deaktivieren",
+                    "deactivateHint": "Möchtest du das Projekt wirklich deaktivieren?",
                     "formWizard": {
                         "step_1": "Projektdaten",
                         "step_2": "Mitlgieder hinzufügen",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index b3d9a3fa3f..979f3677c3 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -121,9 +121,9 @@
                     "edit": "Update project",
                     "profile": "Research project",
                     "editSuccess": "You have successfully updated this project.",
-                    "delete": "Deactivate project",
-                    "deleteHint": "You're sure to delete this project?",
-                    "deleteButton": "Deactivate project now",
+                    "deactivate": "Deactivate project",
+                    "deactivateHint": "You're sure to deactivate this project?",
+                    "deactivateButton": "Deactivate project now",
                     "activate": "Do you want to reactivate?",
                     "activateButton": "Reactivate project now",
                     "formWizard": {