diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index 4350d20..2470324 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -70,33 +70,3 @@ jobs:
           CI_REGISTRY_IMAGE: git.spbr.net/spacebar/rust-nex
           CI_COMMIT_SHORT_SHA: ${{ env.SHORT_SHA }}
         run: ./.ci-scripts/make-edition.sh friends
-
-  super-mario-maker:
-    runs-on: debian-trixie
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Cache container storage
-        uses: actions/cache@v4
-        with:
-          path: |
-            /var/lib/containers/storage
-            /run/containers/storage
-            ~/.local/share/containers/storage
-          key: image-cache
-
-      - name: Set short SHA
-        run: echo "SHORT_SHA=${GITHUB_SHA::6}" >> $GITHUB_ENV
-
-      - name: Login to registry
-        run: podman login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net
-
-      - name: Build Friends edition
-        env:
-          CI_REGISTRY_IMAGE: git.spbr.net/spacebar/rust-nex
-          CI_COMMIT_SHORT_SHA: ${{ env.SHORT_SHA }}
-        run: ./.ci-scripts/make-edition.sh super-mario-maker
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b9a013..900885c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,3 @@ splatoon:
 friends:
   stage: build_and_test
   script: ./.ci-scripts/make-edition.sh friends
-
-super-mario-maker:
-  stage: build_and_test
-  script: ./.ci-scripts/make-edition.sh super-mario-maker
diff --git a/Cargo.lock b/Cargo.lock
index bf83871..0fd5a6a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,15 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli",
+]
+
 [[package]]
 name = "adler2"
 version = "2.0.1"
@@ -55,12 +64,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
 [[package]]
 name = "autocfg"
 version = "1.5.0"
@@ -68,469 +71,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
-name = "aws-config"
-version = "1.8.15"
+name = "backtrace"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11493b0bad143270fb8ad284a096dd529ba91924c5409adeac856cc1bf047dbc"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-sdk-sso",
- "aws-sdk-ssooidc",
- "aws-sdk-sts",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes",
- "fastrand",
- "hex",
- "http 1.3.1",
- "sha1",
- "time",
- "tokio",
- "tracing",
- "url",
- "zeroize",
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "aws-credential-types"
-version = "1.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f20799b373a1be121fe3005fba0c2090af9411573878f224df44b42727fcaf7"
-dependencies = [
- "aws-smithy-async",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "zeroize",
-]
-
-[[package]]
-name = "aws-lc-rs"
-version = "1.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc"
-dependencies = [
- "aws-lc-sys",
- "zeroize",
-]
-
-[[package]]
-name = "aws-lc-sys"
-version = "0.39.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a25cf98105baa966497416dbd42565ce3a8cf8dbfd59803ec9ad46f3126399"
-dependencies = [
- "cc",
- "cmake",
- "dunce",
- "fs_extra",
-]
-
-[[package]]
-name = "aws-runtime"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc0651c57e384202e47153c1260b84a9936e19803d747615edf199dc3b98d17"
-dependencies = [
- "aws-credential-types",
- "aws-sigv4",
- "aws-smithy-async",
- "aws-smithy-eventstream",
- "aws-smithy-http",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes",
- "bytes-utils",
- "fastrand",
- "http 0.2.12",
- "http 1.3.1",
- "http-body 0.4.6",
- "http-body 1.0.1",
- "percent-encoding",
- "pin-project-lite",
- "tracing",
- "uuid",
-]
-
-[[package]]
-name = "aws-sdk-s3"
-version = "1.129.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d4e8410fadbc0ee453145dd77a4958227b18b05bf67c2795d0a8b8596c9aa0f"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-sigv4",
- "aws-smithy-async",
- "aws-smithy-checksums",
- "aws-smithy-eventstream",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-observability",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-smithy-xml",
- "aws-types",
- "bytes",
- "fastrand",
- "hex",
- "hmac",
- "http 0.2.12",
- "http 1.3.1",
- "http-body 1.0.1",
- "lru",
- "percent-encoding",
- "regex-lite",
- "sha2",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "aws-sdk-sso"
-version = "1.97.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aadc669e184501caaa6beafb28c6267fc1baef0810fb58f9b205485ca3f2567"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-observability",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes",
- "fastrand",
- "http 0.2.12",
- "http 1.3.1",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sdk-ssooidc"
-version = "1.99.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1342a7db8f358d3de0aed2007a0b54e875458e39848d54cc1d46700b2bfcb0a8"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-observability",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes",
- "fastrand",
- "http 0.2.12",
- "http 1.3.1",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sdk-sts"
-version = "1.101.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab41ad64e4051ecabeea802d6a17845a91e83287e1dd249e6963ea1ba78c428a"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-observability",
- "aws-smithy-query",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-smithy-xml",
- "aws-types",
- "fastrand",
- "http 0.2.12",
- "http 1.3.1",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sigv4"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0b660013a6683ab23797778e21f1f854744fdf05f68204b4cca4c8c04b5d1f4"
-dependencies = [
- "aws-credential-types",
- "aws-smithy-eventstream",
- "aws-smithy-http",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "bytes",
- "crypto-bigint 0.5.5",
- "form_urlencoded",
- "hex",
- "hmac",
- "http 0.2.12",
- "http 1.3.1",
- "p256",
- "percent-encoding",
- "ring",
- "sha2",
- "subtle",
- "time",
- "tracing",
- "zeroize",
-]
-
-[[package]]
-name = "aws-smithy-async"
-version = "1.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffcaf626bdda484571968400c326a244598634dc75fd451325a54ad1a59acfc"
-dependencies = [
- "futures-util",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "aws-smithy-checksums"
-version = "0.64.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6750f3dd509b0694a4377f0293ed2f9630d710b1cebe281fa8bac8f099f88bc6"
-dependencies = [
- "aws-smithy-http",
- "aws-smithy-types",
- "bytes",
- "crc-fast",
- "hex",
- "http 1.3.1",
- "http-body 1.0.1",
- "http-body-util",
- "md-5",
- "pin-project-lite",
- "sha1",
- "sha2",
- "tracing",
-]
-
-[[package]]
-name = "aws-smithy-eventstream"
-version = "0.60.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faf09d74e5e32f76b8762da505a3cd59303e367a664ca67295387baa8c1d7548"
-dependencies = [
- "aws-smithy-types",
- "bytes",
- "crc32fast",
-]
-
-[[package]]
-name = "aws-smithy-http"
-version = "0.63.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1ab2dc1c2c3749ead27180d333c42f11be8b0e934058fb4b2258ee8dbe5231"
-dependencies = [
- "aws-smithy-eventstream",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "bytes",
- "bytes-utils",
- "futures-core",
- "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "http-body-util",
- "percent-encoding",
- "pin-project-lite",
- "pin-utils",
- "tracing",
-]
-
-[[package]]
-name = "aws-smithy-http-client"
-version = "1.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a2f165a7feee6f263028b899d0a181987f4fa7179a6411a32a439fba7c5f769"
-dependencies = [
- "aws-smithy-async",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "h2 0.3.27",
- "h2 0.4.13",
- "http 0.2.12",
- "http 1.3.1",
- "http-body 0.4.6",
- "hyper 0.14.32",
- "hyper 1.9.0",
- "hyper-rustls 0.24.2",
- "hyper-rustls 0.27.8",
- "hyper-util",
- "pin-project-lite",
- "rustls 0.21.12",
- "rustls 0.23.31",
- "rustls-native-certs",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls 0.26.4",
- "tower",
- "tracing",
-]
-
-[[package]]
-name = "aws-smithy-json"
-version = "0.62.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9648b0bb82a2eedd844052c6ad2a1a822d1f8e3adee5fbf668366717e428856a"
-dependencies = [
- "aws-smithy-types",
-]
-
-[[package]]
-name = "aws-smithy-observability"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06c2315d173edbf1920da8ba3a7189695827002e4c0fc961973ab1c54abca9c"
-dependencies = [
- "aws-smithy-runtime-api",
-]
-
-[[package]]
-name = "aws-smithy-query"
-version = "0.60.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a56d79744fb3edb5d722ef79d86081e121d3b9422cb209eb03aea6aa4f21ebd"
-dependencies = [
- "aws-smithy-types",
- "urlencoding",
-]
-
-[[package]]
-name = "aws-smithy-runtime"
-version = "1.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028999056d2d2fd58a697232f9eec4a643cf73a71cf327690a7edad1d2af2110"
-dependencies = [
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-http-client",
- "aws-smithy-observability",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "bytes",
- "fastrand",
- "http 0.2.12",
- "http 1.3.1",
- "http-body 0.4.6",
- "http-body 1.0.1",
- "http-body-util",
- "pin-project-lite",
- "pin-utils",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "aws-smithy-runtime-api"
-version = "1.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876ab3c9c29791ba4ba02b780a3049e21ec63dabda09268b175272c3733a79e6"
-dependencies = [
- "aws-smithy-async",
- "aws-smithy-types",
- "bytes",
- "http 0.2.12",
- "http 1.3.1",
- "pin-project-lite",
- "tokio",
- "tracing",
- "zeroize",
-]
-
-[[package]]
-name = "aws-smithy-types"
-version = "1.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d73dbfbaa8e4bc57b9045137680b958d274823509a360abfd8e1d514d40c95c"
-dependencies = [
- "base64-simd",
- "bytes",
- "bytes-utils",
- "futures-core",
- "http 0.2.12",
- "http 1.3.1",
- "http-body 0.4.6",
- "http-body 1.0.1",
- "http-body-util",
- "itoa",
- "num-integer",
- "pin-project-lite",
- "pin-utils",
- "ryu",
- "serde",
- "time",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "aws-smithy-xml"
-version = "0.60.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce02add1aa3677d022f8adf81dcbe3046a95f17a1b1e8979c145cd21d3d22b3"
-dependencies = [
- "xmlparser",
-]
-
-[[package]]
-name = "aws-types"
-version = "1.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47c8323699dd9b3c8d5b3c13051ae9cdef58fd179957c882f8374dd8725962d9"
-dependencies = [
- "aws-credential-types",
- "aws-smithy-async",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "rustc_version",
- "tracing",
-]
-
-[[package]]
-name = "base16ct"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
-
 [[package]]
 name = "base64"
 version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
-[[package]]
-name = "base64-simd"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195"
-dependencies = [
- "outref",
- "vsimd",
-]
-
 [[package]]
 name = "base64ct"
 version = "1.8.3"
@@ -589,29 +149,16 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.11.1"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
-
-[[package]]
-name = "bytes-utils"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35"
-dependencies = [
- "bytes",
- "either",
-]
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "cc"
-version = "1.2.60"
+version = "1.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
+checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2"
 dependencies = [
- "find-msvc-tools",
- "jobserver",
- "libc",
  "shlex",
 ]
 
@@ -645,15 +192,6 @@ dependencies = [
  "inout",
 ]
 
-[[package]]
-name = "cmake"
-version = "0.1.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -725,30 +263,18 @@ dependencies = [
 
 [[package]]
 name = "crc"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
+checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
 dependencies = [
  "crc-catalog",
 ]
 
 [[package]]
 name = "crc-catalog"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
-
-[[package]]
-name = "crc-fast"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd92aca2c6001b1bf5ba0ff84ee74ec8501b52bbef0cac80bf25a6c1d87a83d"
-dependencies = [
- "crc",
- "digest",
- "rustversion",
- "spin 0.10.0",
-]
+checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853"
 
 [[package]]
 name = "crc32fast"
@@ -774,28 +300,6 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
-[[package]]
-name = "crypto-bigint"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
-dependencies = [
- "generic-array",
- "rand_core 0.6.4",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "crypto-bigint"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
-dependencies = [
- "rand_core 0.6.4",
- "subtle",
-]
-
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -812,16 +316,6 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
 
-[[package]]
-name = "der"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
-dependencies = [
- "const-oid",
- "zeroize",
-]
-
 [[package]]
 name = "der"
 version = "0.7.10"
@@ -886,24 +380,6 @@ version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
-[[package]]
-name = "dunce"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
-
-[[package]]
-name = "ecdsa"
-version = "0.14.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
-dependencies = [
- "der 0.6.1",
- "elliptic-curve",
- "rfc6979",
- "signature 1.6.4",
-]
-
 [[package]]
 name = "either"
 version = "1.15.0"
@@ -913,26 +389,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "elliptic-curve"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
-dependencies = [
- "base16ct",
- "crypto-bigint 0.4.9",
- "der 0.6.1",
- "digest",
- "ff",
- "generic-array",
- "group",
- "pkcs8 0.9.0",
- "rand_core 0.6.4",
- "sec1",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -961,28 +417,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "fastrand"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
-
-[[package]]
-name = "ff"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
-dependencies = [
- "rand_core 0.6.4",
- "subtle",
-]
-
-[[package]]
-name = "find-msvc-tools"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
-
 [[package]]
 name = "flate2"
 version = "1.1.5"
@@ -1001,7 +435,7 @@ checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
 dependencies = [
  "futures-core",
  "futures-sink",
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
@@ -1016,12 +450,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
-[[package]]
-name = "foldhash"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.2"
@@ -1031,12 +459,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fs_extra"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
-
 [[package]]
 name = "futures-channel"
 version = "0.3.31"
@@ -1155,53 +577,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "group"
-version = "0.12.1"
+name = "gimli"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
-dependencies = [
- "ff",
- "rand_core 0.6.4",
- "subtle",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 0.2.12",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "h2"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http 1.3.1",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "hashbrown"
@@ -1211,7 +590,7 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
  "allocator-api2",
  "equivalent",
- "foldhash 0.1.5",
+ "foldhash",
 ]
 
 [[package]]
@@ -1219,11 +598,6 @@ name = "hashbrown"
 version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
-dependencies = [
- "allocator-api2",
- "equivalent",
- "foldhash 0.2.0",
-]
 
 [[package]]
 name = "hashlink"
@@ -1273,17 +647,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
 [[package]]
 name = "http"
 version = "1.3.1"
@@ -1295,151 +658,12 @@ dependencies = [
  "itoa",
 ]
 
-[[package]]
-name = "http-body"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-dependencies = [
- "bytes",
- "http 0.2.12",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-dependencies = [
- "bytes",
- "http 1.3.1",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
-dependencies = [
- "bytes",
- "futures-core",
- "http 1.3.1",
- "http-body 1.0.1",
- "pin-project-lite",
-]
-
 [[package]]
 name = "httparse"
 version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "hyper"
-version = "0.14.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2 0.3.27",
- "http 0.2.12",
- "http-body 0.4.6",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2 0.5.10",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca"
-dependencies = [
- "atomic-waker",
- "bytes",
- "futures-channel",
- "futures-core",
- "h2 0.4.13",
- "http 1.3.1",
- "http-body 1.0.1",
- "httparse",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
-dependencies = [
- "futures-util",
- "http 0.2.12",
- "hyper 0.14.32",
- "log",
- "rustls 0.21.12",
- "tokio",
- "tokio-rustls 0.24.1",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2b52f86d1d4bc0d6b4e6826d960b1b333217e07d36b882dca570a5e1c48895b"
-dependencies = [
- "http 1.3.1",
- "hyper 1.9.0",
- "hyper-util",
- "rustls 0.23.31",
- "rustls-native-certs",
- "tokio",
- "tokio-rustls 0.26.4",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
-dependencies = [
- "base64",
- "bytes",
- "futures-channel",
- "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "hyper 1.9.0",
- "ipnet",
- "libc",
- "percent-encoding",
- "pin-project-lite",
- "socket2 0.6.3",
- "tokio",
- "tower-service",
- "tracing",
-]
-
 [[package]]
 name = "iana-time-zone"
 version = "0.1.63"
@@ -1586,26 +810,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "ipnet"
-version = "2.12.0"
+name = "io-uring"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
+checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+]
 
 [[package]]
 name = "itoa"
-version = "1.0.18"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
-
-[[package]]
-name = "jobserver"
-version = "0.1.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
-dependencies = [
- "getrandom 0.3.4",
- "libc",
-]
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "js-sys"
@@ -1629,14 +848,14 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.185"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "libm"
@@ -1694,15 +913,6 @@ version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
-[[package]]
-name = "lru"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593"
-dependencies = [
- "hashbrown 0.16.1",
-]
-
 [[package]]
 name = "macros"
 version = "0.0.0"
@@ -1750,13 +960,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.2.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
  "wasi",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1820,6 +1030,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "object"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -1832,23 +1051,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f50d9b3dabb09ecd771ad0aa242ca6894994c130308ca3d7684634df8037391"
 
-[[package]]
-name = "outref"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
-
-[[package]]
-name = "p256"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "sha2",
-]
-
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -1917,19 +1119,9 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
 dependencies = [
- "der 0.7.10",
- "pkcs8 0.10.2",
- "spki 0.7.3",
-]
-
-[[package]]
-name = "pkcs8"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
-dependencies = [
- "der 0.6.1",
- "spki 0.6.0",
+ "der",
+ "pkcs8",
+ "spki",
 ]
 
 [[package]]
@@ -1938,8 +1130,8 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
 dependencies = [
- "der 0.7.10",
- "spki 0.7.3",
+ "der",
+ "spki",
 ]
 
 [[package]]
@@ -2163,23 +1355,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "regex-lite"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973"
-
-[[package]]
-name = "rfc6979"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
-dependencies = [
- "crypto-bigint 0.4.9",
- "hmac",
- "zeroize",
-]
-
 [[package]]
 name = "ring"
 version = "0.17.14"
@@ -2199,9 +1374,6 @@ name = "rnex-core"
 version = "0.1.1"
 dependencies = [
  "anyhow",
- "aws-config",
- "aws-sdk-s3",
- "base64",
  "bytemuck",
  "cfg-if",
  "chrono",
@@ -2218,14 +1390,12 @@ dependencies = [
  "rc4",
  "serde",
  "serde_json",
- "sha2",
  "simplelog",
  "sqlx",
  "thiserror",
  "tokio",
  "typenum",
  "ureq",
- "urlencoding",
  "v-byte-helpers",
 ]
 
@@ -2241,34 +1411,19 @@ dependencies = [
  "num-integer",
  "num-traits",
  "pkcs1",
- "pkcs8 0.10.2",
+ "pkcs8",
  "rand_core 0.6.4",
- "signature 2.2.0",
- "spki 0.7.3",
+ "signature",
+ "spki",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
-name = "rustc_version"
-version = "0.4.1"
+name = "rustc-demangle"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustls"
-version = "0.21.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
-dependencies = [
- "log",
- "ring",
- "rustls-webpki 0.101.7",
- "sct",
-]
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
 
 [[package]]
 name = "rustls"
@@ -2276,12 +1431,11 @@ version = "0.23.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
 dependencies = [
- "aws-lc-rs",
  "log",
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.103.4",
+ "rustls-webpki",
  "subtle",
  "zeroize",
 ]
@@ -2307,23 +1461,12 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "rustls-webpki"
-version = "0.101.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "rustls-webpki"
 version = "0.103.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
 dependencies = [
- "aws-lc-rs",
  "ring",
  "rustls-pki-types",
  "untrusted",
@@ -2356,30 +1499,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "sct"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "sec1"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
-dependencies = [
- "base16ct",
- "der 0.6.1",
- "generic-array",
- "pkcs8 0.9.0",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "security-framework"
 version = "3.5.1"
@@ -2403,12 +1522,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
-
 [[package]]
 name = "serde"
 version = "1.0.228"
@@ -2501,16 +1614,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "signature"
-version = "1.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-dependencies = [
- "digest",
- "rand_core 0.6.4",
-]
-
 [[package]]
 name = "signature"
 version = "2.2.0"
@@ -2555,22 +1658,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.10"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "socket2"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
-dependencies = [
- "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2582,22 +1675,6 @@ dependencies = [
  "lock_api",
 ]
 
-[[package]]
-name = "spin"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
-
-[[package]]
-name = "spki"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
-dependencies = [
- "base64ct",
- "der 0.6.1",
-]
-
 [[package]]
 name = "spki"
 version = "0.7.3"
@@ -2605,7 +1682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
- "der 0.7.10",
+ "der",
 ]
 
 [[package]]
@@ -2629,7 +1706,6 @@ checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6"
 dependencies = [
  "base64",
  "bytes",
- "chrono",
  "crc",
  "crossbeam-queue",
  "either",
@@ -2650,9 +1726,6 @@ dependencies = [
  "sha2",
  "smallvec",
  "thiserror",
- "time",
- "tokio",
- "tokio-stream",
  "tracing",
  "url",
 ]
@@ -2691,7 +1764,6 @@ dependencies = [
  "sqlx-postgres",
  "sqlx-sqlite",
  "syn 2.0.104",
- "tokio",
  "url",
 ]
 
@@ -2706,7 +1778,6 @@ dependencies = [
  "bitflags",
  "byteorder",
  "bytes",
- "chrono",
  "crc",
  "digest",
  "dotenvy",
@@ -2734,7 +1805,6 @@ dependencies = [
  "sqlx-core",
  "stringprep",
  "thiserror",
- "time",
  "tracing",
  "whoami",
 ]
@@ -2749,7 +1819,6 @@ dependencies = [
  "base64",
  "bitflags",
  "byteorder",
- "chrono",
  "crc",
  "dotenvy",
  "etcetera",
@@ -2773,7 +1842,6 @@ dependencies = [
  "sqlx-core",
  "stringprep",
  "thiserror",
- "time",
  "tracing",
  "whoami",
 ]
@@ -2785,7 +1853,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea"
 dependencies = [
  "atoi",
- "chrono",
  "flume",
  "futures-channel",
  "futures-core",
@@ -2799,7 +1866,6 @@ dependencies = [
  "serde_urlencoded",
  "sqlx-core",
  "thiserror",
- "time",
  "tracing",
  "url",
 ]
@@ -2949,60 +2015,42 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.51.1"
+version = "1.47.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f66bf9585cda4b724d3e78ab34b73fb2bbaba9011b9bfdf69dc836382ea13b8c"
+checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
 dependencies = [
+ "backtrace",
  "bytes",
+ "io-uring",
  "libc",
  "mio",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.6.3",
+ "slab",
+ "socket2",
  "tokio-macros",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.7.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.104",
 ]
 
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls 0.21.12",
- "tokio",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
- "rustls 0.23.31",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
-dependencies = [
- "futures-core",
- "pin-project-lite",
+ "rustls",
  "tokio",
 ]
 
@@ -3014,49 +2062,14 @@ checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857"
 dependencies = [
  "futures-util",
  "log",
- "rustls 0.23.31",
+ "rustls",
  "rustls-native-certs",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.4",
+ "tokio-rustls",
  "tungstenite",
 ]
 
-[[package]]
-name = "tokio-util"
-version = "0.7.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tower"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
-dependencies = [
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
-[[package]]
-name = "tower-service"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
-
 [[package]]
 name = "tracing"
 version = "0.1.44"
@@ -3089,12 +2102,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
 [[package]]
 name = "tungstenite"
 version = "0.28.0"
@@ -3103,11 +2110,11 @@ checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442"
 dependencies = [
  "bytes",
  "data-encoding",
- "http 1.3.1",
+ "http",
  "httparse",
  "log",
  "rand 0.9.2",
- "rustls 0.23.31",
+ "rustls",
  "rustls-pki-types",
  "sha1",
  "thiserror",
@@ -3164,7 +2171,7 @@ dependencies = [
  "flate2",
  "log",
  "percent-encoding",
- "rustls 0.23.31",
+ "rustls",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -3180,7 +2187,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b4531c118335662134346048ddb0e54cc86bd7e81866757873055f0e38f5d2"
 dependencies = [
  "base64",
- "http 1.3.1",
+ "http",
  "httparse",
  "log",
 ]
@@ -3196,12 +2203,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
 [[package]]
 name = "utf-8"
 version = "0.7.6"
@@ -3214,16 +2215,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
-[[package]]
-name = "uuid"
-version = "1.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "v-byte-helpers"
 version = "0.1.1"
@@ -3245,21 +2236,6 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
-[[package]]
-name = "vsimd"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
 [[package]]
 name = "wasi"
 version = "0.11.1+wasi-snapshot-preview1"
@@ -3601,12 +2577,6 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
-[[package]]
-name = "xmlparser"
-version = "0.13.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
-
 [[package]]
 name = "yoke"
 version = "0.8.1"
diff --git a/editions.yaml b/editions.yaml
index 632274f..ab27550 100644
--- a/editions.yaml
+++ b/editions.yaml
@@ -1,13 +1,3 @@
-wiiu-chat:
-  features:
-    - prudpv1
-    - v3-8-15
-  settings:
-    AUTH_REPORT_VERSION: "branch:origin/project/wup-agmj build:3_8_15_2004_0"
-    RNEX_VIRTUAL_PORT_INSECURE: "1:10"
-    RNEX_VIRTUAL_PORT_SECURE: "1:10"
-    RNEX_DEFAULT_PORT: 10000
-    RNEX_ACCESS_KEY: "e7a47214"
 splatoon:
   features:
     - prudpv1
@@ -27,14 +17,3 @@ friends:
     RNEX_VIRTUAL_PORT_SECURE: "1:10"
     RNEX_DEFAULT_PORT: 6000
     RNEX_ACCESS_KEY: "ridfebb9"
-super-mario-maker:
-  features:
-    - prudpv1
-    - v3-8-15
-    - datastore
-  settings:
-    AUTH_REPORT_VERSION: "branch:origin/project/wup-ama build:3_8_29_3022_0"
-    RNEX_VIRTUAL_PORT_INSECURE: "1:10"
-    RNEX_VIRTUAL_PORT_SECURE: "1:10"
-    RNEX_DEFAULT_PORT: 6000
-    RNEX_ACCESS_KEY: "9f2b4678"
diff --git a/rnex-core/.sqlx/query-164708b549c483a041d2e54065ed3ffbd9f8d5304f6aa6d785dbddbb1626c0e9.json b/rnex-core/.sqlx/query-164708b549c483a041d2e54065ed3ffbd9f8d5304f6aa6d785dbddbb1626c0e9.json
deleted file mode 100644
index abf5c03..0000000
--- a/rnex-core/.sqlx/query-164708b549c483a041d2e54065ed3ffbd9f8d5304f6aa6d785dbddbb1626c0e9.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT owner, under_review FROM datastore.objects WHERE data_id = $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "owner",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "under_review",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      true,
-      false
-    ]
-  },
-  "hash": "164708b549c483a041d2e54065ed3ffbd9f8d5304f6aa6d785dbddbb1626c0e9"
-}
diff --git a/rnex-core/.sqlx/query-1c2be699b4bfc7e5e6d3a74d7badf67d1812b99e1ec952a044fc03e1a5c63703.json b/rnex-core/.sqlx/query-1c2be699b4bfc7e5e6d3a74d7badf67d1812b99e1ec952a044fc03e1a5c63703.json
deleted file mode 100644
index befa7e1..0000000
--- a/rnex-core/.sqlx/query-1c2be699b4bfc7e5e6d3a74d7badf67d1812b99e1ec952a044fc03e1a5c63703.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT data_id, owner, size, name, data_type, meta_binary,\n                          permission, permission_recipients, delete_permission, delete_permission_recipients,\n                          period, refer_data_id, flag, tags, creation_date, update_date\n                   FROM datastore.objects WHERE data_id = $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "data_id",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "owner",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 2,
-        "name": "size",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 3,
-        "name": "name",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 4,
-        "name": "data_type",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 5,
-        "name": "meta_binary",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 6,
-        "name": "permission",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 7,
-        "name": "permission_recipients",
-        "type_info": "Int4Array"
-      },
-      {
-        "ordinal": 8,
-        "name": "delete_permission",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 9,
-        "name": "delete_permission_recipients",
-        "type_info": "Int4Array"
-      },
-      {
-        "ordinal": 10,
-        "name": "period",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 11,
-        "name": "refer_data_id",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 12,
-        "name": "flag",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 13,
-        "name": "tags",
-        "type_info": "TextArray"
-      },
-      {
-        "ordinal": 14,
-        "name": "creation_date",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 15,
-        "name": "update_date",
-        "type_info": "Timestamp"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true
-    ]
-  },
-  "hash": "1c2be699b4bfc7e5e6d3a74d7badf67d1812b99e1ec952a044fc03e1a5c63703"
-}
diff --git a/rnex-core/.sqlx/query-219fec3fc852f36de99e5f00ca7a1675439bb44c91158f8b8a696e326c45447c.json b/rnex-core/.sqlx/query-219fec3fc852f36de99e5f00ca7a1675439bb44c91158f8b8a696e326c45447c.json
deleted file mode 100644
index cf80412..0000000
--- a/rnex-core/.sqlx/query-219fec3fc852f36de99e5f00ca7a1675439bb44c91158f8b8a696e326c45447c.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                        INSERT INTO datastore.objects (\n                            owner, size, name, data_type, meta_binary,\n                            permission, permission_recipients,\n                            delete_permission, delete_permission_recipients,\n                            flag, period, refer_data_id, tags,\n                            persistence_slot_id, extra_data, creation_date, update_date\n                        ) VALUES (\n                            $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17\n                        ) RETURNING data_id\n                        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "data_id",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Int4",
-        "Text",
-        "Int4",
-        "Bytea",
-        "Int4",
-        "Int4Array",
-        "Int4",
-        "Int4Array",
-        "Int4",
-        "Int4",
-        "Int8",
-        "TextArray",
-        "Int4",
-        "TextArray",
-        "Timestamp",
-        "Timestamp"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "219fec3fc852f36de99e5f00ca7a1675439bb44c91158f8b8a696e326c45447c"
-}
diff --git a/rnex-core/.sqlx/query-29d4f5c07b36c3d3b6b54a86a1757f27247530878b7f82feeb65802d995a38c4.json b/rnex-core/.sqlx/query-29d4f5c07b36c3d3b6b54a86a1757f27247530878b7f82feeb65802d995a38c4.json
deleted file mode 100644
index 0c3393d..0000000
--- a/rnex-core/.sqlx/query-29d4f5c07b36c3d3b6b54a86a1757f27247530878b7f82feeb65802d995a38c4.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                            INSERT INTO datastore.object_custom_rankings (data_id, application_id, value)\n                            VALUES ($1, $2, $3)\n                            ON CONFLICT (data_id, application_id)\n                            DO UPDATE SET value = datastore.object_custom_rankings.value + EXCLUDED.value\n                            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int8",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "29d4f5c07b36c3d3b6b54a86a1757f27247530878b7f82feeb65802d995a38c4"
-}
diff --git a/rnex-core/.sqlx/query-2ff34379bbc32276c3b78ef1283b8158ea907d36588e1e59f6cbe752d89361bb.json b/rnex-core/.sqlx/query-2ff34379bbc32276c3b78ef1283b8158ea907d36588e1e59f6cbe752d89361bb.json
deleted file mode 100644
index 83246ca..0000000
--- a/rnex-core/.sqlx/query-2ff34379bbc32276c3b78ef1283b8158ea907d36588e1e59f6cbe752d89361bb.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT EXISTS(SELECT 1 FROM datastore.objects WHERE data_id = $1)",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "exists",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "2ff34379bbc32276c3b78ef1283b8158ea907d36588e1e59f6cbe752d89361bb"
-}
diff --git a/rnex-core/.sqlx/query-37d449b81e2aa3abdbdaf38587ae1a6a6c5c38acb06d91c5b0924c3f0a5d2e92.json b/rnex-core/.sqlx/query-37d449b81e2aa3abdbdaf38587ae1a6a6c5c38acb06d91c5b0924c3f0a5d2e92.json
deleted file mode 100644
index 35c78ee..0000000
--- a/rnex-core/.sqlx/query-37d449b81e2aa3abdbdaf38587ae1a6a6c5c38acb06d91c5b0924c3f0a5d2e92.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                SELECT data_id\n                FROM datastore.objects\n                WHERE owner = $1 AND data_type > 2 AND data_type < 50\n                ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "data_id",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "37d449b81e2aa3abdbdaf38587ae1a6a6c5c38acb06d91c5b0924c3f0a5d2e92"
-}
diff --git a/rnex-core/.sqlx/query-3d06238fddc72d1ba452602e1a8002e9186ce1dfc6c68b52d9d2a8a38f5c3a1f.json b/rnex-core/.sqlx/query-3d06238fddc72d1ba452602e1a8002e9186ce1dfc6c68b52d9d2a8a38f5c3a1f.json
deleted file mode 100644
index 166c25d..0000000
--- a/rnex-core/.sqlx/query-3d06238fddc72d1ba452602e1a8002e9186ce1dfc6c68b52d9d2a8a38f5c3a1f.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                SELECT buffer\n                FROM datastore.buffer_queues\n                WHERE data_id = $1 AND slot = $2\n                ORDER BY creation_date ASC\n                ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "buffer",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int4"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "3d06238fddc72d1ba452602e1a8002e9186ce1dfc6c68b52d9d2a8a38f5c3a1f"
-}
diff --git a/rnex-core/.sqlx/query-8605011b998a4608c739bf5ab388a7a9bf551126712c1d1089a4263453090e79.json b/rnex-core/.sqlx/query-8605011b998a4608c739bf5ab388a7a9bf551126712c1d1089a4263453090e79.json
deleted file mode 100644
index dd1c783..0000000
--- a/rnex-core/.sqlx/query-8605011b998a4608c739bf5ab388a7a9bf551126712c1d1089a4263453090e79.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                SELECT\n                    rankings.data_id,\n                    rankings.value\n                FROM datastore.object_custom_rankings rankings\n                JOIN UNNEST($1::bigint[]) WITH ORDINALITY AS rows(data_id, ord)\n                    ON rankings.data_id = rows.data_id\n                    AND rankings.application_id = $2\n                ORDER BY rows.ord\n                ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "data_id",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "value",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8Array",
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      true
-    ]
-  },
-  "hash": "8605011b998a4608c739bf5ab388a7a9bf551126712c1d1089a4263453090e79"
-}
diff --git a/rnex-core/.sqlx/query-8706ac06d78ffaa2a45418be7ae71340561031d8e5c91f46c041f83e54c31a7d.json b/rnex-core/.sqlx/query-8706ac06d78ffaa2a45418be7ae71340561031d8e5c91f46c041f83e54c31a7d.json
deleted file mode 100644
index dbab55e..0000000
--- a/rnex-core/.sqlx/query-8706ac06d78ffaa2a45418be7ae71340561031d8e5c91f46c041f83e54c31a7d.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                SELECT slot, total_value, count, initial_value\n                FROM datastore.object_ratings\n                WHERE data_id = $1\n                ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "slot",
-        "type_info": "Int2"
-      },
-      {
-        "ordinal": 1,
-        "name": "total_value",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 2,
-        "name": "count",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 3,
-        "name": "initial_value",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      true,
-      false,
-      true
-    ]
-  },
-  "hash": "8706ac06d78ffaa2a45418be7ae71340561031d8e5c91f46c041f83e54c31a7d"
-}
diff --git a/rnex-core/.sqlx/query-93be6b6b0ac5d85881e6e223a7d48f5eb4a3761dd71129ba6939cdd0d62569fb.json b/rnex-core/.sqlx/query-93be6b6b0ac5d85881e6e223a7d48f5eb4a3761dd71129ba6939cdd0d62569fb.json
deleted file mode 100644
index 0a8127b..0000000
--- a/rnex-core/.sqlx/query-93be6b6b0ac5d85881e6e223a7d48f5eb4a3761dd71129ba6939cdd0d62569fb.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                SELECT under_review, access_password\n                FROM datastore.objects\n                WHERE data_id = $1 AND upload_completed = TRUE AND deleted = FALSE\n                ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "under_review",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 1,
-        "name": "access_password",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "93be6b6b0ac5d85881e6e223a7d48f5eb4a3761dd71129ba6939cdd0d62569fb"
-}
diff --git a/rnex-core/.sqlx/query-e28d8776cc49b55fe76cf33ac12fe18e500d243f1b55fd18e7d96d281605bcf9.json b/rnex-core/.sqlx/query-e28d8776cc49b55fe76cf33ac12fe18e500d243f1b55fd18e7d96d281605bcf9.json
deleted file mode 100644
index 552f92a..0000000
--- a/rnex-core/.sqlx/query-e28d8776cc49b55fe76cf33ac12fe18e500d243f1b55fd18e7d96d281605bcf9.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE datastore.objects SET upload_completed = true WHERE data_id = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "e28d8776cc49b55fe76cf33ac12fe18e500d243f1b55fd18e7d96d281605bcf9"
-}
diff --git a/rnex-core/.sqlx/query-efe4bf3602782a0d521274956e0fcecccf8f0f8dd20d890a76acf85265b2192c.json b/rnex-core/.sqlx/query-efe4bf3602782a0d521274956e0fcecccf8f0f8dd20d890a76acf85265b2192c.json
deleted file mode 100644
index 60714c0..0000000
--- a/rnex-core/.sqlx/query-efe4bf3602782a0d521274956e0fcecccf8f0f8dd20d890a76acf85265b2192c.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT data_id, owner, size, name, data_type, meta_binary,\n                          permission, permission_recipients, delete_permission, delete_permission_recipients,\n                          period, refer_data_id, flag, tags, creation_date, update_date,\n                          access_password, under_review\n                   FROM datastore.objects\n                   WHERE owner = $1 AND persistence_slot_id = $2\n                   AND upload_completed = TRUE AND deleted = FALSE",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "data_id",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "owner",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 2,
-        "name": "size",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 3,
-        "name": "name",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 4,
-        "name": "data_type",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 5,
-        "name": "meta_binary",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 6,
-        "name": "permission",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 7,
-        "name": "permission_recipients",
-        "type_info": "Int4Array"
-      },
-      {
-        "ordinal": 8,
-        "name": "delete_permission",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 9,
-        "name": "delete_permission_recipients",
-        "type_info": "Int4Array"
-      },
-      {
-        "ordinal": 10,
-        "name": "period",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 11,
-        "name": "refer_data_id",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 12,
-        "name": "flag",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 13,
-        "name": "tags",
-        "type_info": "TextArray"
-      },
-      {
-        "ordinal": 14,
-        "name": "creation_date",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 15,
-        "name": "update_date",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 16,
-        "name": "access_password",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 17,
-        "name": "under_review",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Int4"
-      ]
-    },
-    "nullable": [
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "efe4bf3602782a0d521274956e0fcecccf8f0f8dd20d890a76acf85265b2192c"
-}
diff --git a/rnex-core/Cargo.toml b/rnex-core/Cargo.toml
index 07d4fda..94638a1 100644
--- a/rnex-core/Cargo.toml
+++ b/rnex-core/Cargo.toml
@@ -28,12 +28,6 @@ anyhow = "1.0.100"
 ureq = { version = "3.1.4", features = [ "json" ] }
 serde = { version = "1.0.228", features = [ "derive" ] }
 serde_json = "1.0.149"
-sqlx = { version = "0.8.6", optional = true, features = ["postgres", "runtime-tokio", "chrono", "time"] }
-aws-sdk-s3 = { version = "1.129.0", optional = true }
-aws-config = { version = "1.8.15", optional = true }
-base64 = "0.22.1"
-sha2 = "0.10.9"
-urlencoding = "2.1.3"
 
 [dependencies.sqlx]
 version = "0.8.6"
@@ -50,7 +44,7 @@ big_pid = []
 v3-8-15 = ["rmc_struct_header"]
 v4-3-11 = ["v3-8-15"]
 nx = ["big_pid"]
-datastore = ["dep:sqlx", "v3-8-15", "dep:aws-sdk-s3", "dep:aws-config"]
+
 
 [[bench]]
 name = "rmc_serialization"
diff --git a/rnex-core/src/executables/backend_server_secure.rs b/rnex-core/src/executables/backend_server_secure.rs
index 88f2508..9d5268d 100644
--- a/rnex-core/src/executables/backend_server_secure.rs
+++ b/rnex-core/src/executables/backend_server_secure.rs
@@ -9,19 +9,6 @@ async fn main() {
         if #[cfg(feature = "friends")]{
             use rnex_core::executables::friends_backend::start_friends_backend;
             start_friends_backend().await;
-        } else if #[cfg(feature = "datastore")] {
-            use rnex_core::executables::common::DB_POOL;
-            use sqlx::PgPool;
-            let database_url = std::env::var("RNEX_DATASTORE_DATABASE_URL")
-                .expect("RNEX_DATASTORE_DATABASE_URL must be set");
-
-            let pool = PgPool::connect(&database_url)
-                .await
-                .expect("Failed to create pool");
-
-            DB_POOL.set(pool).expect("failed to set global DB_POOL");
-            use rnex_core::executables::regular_backend;
-            regular_backend::start_regular_backend().await
         } else {
             use rnex_core::executables::regular_backend;
             regular_backend::start_regular_backend().await
diff --git a/rnex-core/src/executables/common.rs b/rnex-core/src/executables/common.rs
index 280ab7f..416e450 100644
--- a/rnex-core/src/executables/common.rs
+++ b/rnex-core/src/executables/common.rs
@@ -8,44 +8,14 @@ use std::io::Cursor;
 use std::net::{Ipv4Addr, SocketAddrV4};
 use std::sync::Arc;
 use tokio::net::TcpListener;
-use std::sync::LazyLock;
-use std::sync::OnceLock;
-cfg_if! {
-    if #[cfg(feature = "datastore")] {
-        use sqlx::postgres::PgPool;
-    }
-}
+
 use log::error;
 use std::error::Error;
-use std::string::ToString;
-use cfg_if::cfg_if;
+
 use crate::reggie::UnitPacketRead;
 
 const IP_REQ_SERVICE_URL: &str = "https://ipinfo.io/ip";
 
-cfg_if! {
-    if #[cfg(feature = "datastore")] {
-        pub static RNEX_DATASTORE_DATABASE_URL: LazyLock<String> = LazyLock::new(|| {
-            std::env::var("RNEX_DATASTORE_DATABASE_URL")
-                .expect("RNEX_DATASTORE_DATABASE_URL must be set")
-        });
-
-        pub static DB_POOL: OnceLock<PgPool> = OnceLock::new();
-
-        pub fn get_db() -> &'static PgPool {
-            DB_POOL.get().expect("db_pool not initialized")
-        }
-        pub static RNEX_DATASTORE_S3_ENDPOINT: LazyLock<String> = LazyLock::new(|| {
-            std::env::var("RNEX_DATASTORE_S3_ENDPOINT")
-                .expect("RNEX_DATASTORE_S3_ENDPOINT must be set")
-        });
-        pub static RNEX_DATASTORE_S3_BUCKET: LazyLock<String> = LazyLock::new(|| {
-            std::env::var("RNEX_DATASTORE_S3_BUCKET")
-                .expect("RNEX_DATASTORE_S3_BUCKET must be set")
-        });
-    }
-}
-
 pub fn try_get_ip() -> Result<Ipv4Addr, Box<dyn Error>> {
     let mut req = ureq::get(IP_REQ_SERVICE_URL).call()?;
 
diff --git a/rnex-core/src/kerberos/mod.rs b/rnex-core/src/kerberos/mod.rs
index 3512eb6..f67af94 100644
--- a/rnex-core/src/kerberos/mod.rs
+++ b/rnex-core/src/kerberos/mod.rs
@@ -51,23 +51,6 @@ pub fn derive_key(pid: PID, password: &[u8]) -> [u8; 16] {
 pub struct KerberosDateTime(pub u64);
 
 impl KerberosDateTime {
-    pub fn from_u64(val: u64) -> Self {
-        Self(val)
-    }
-
-    pub fn from_naive(dt: chrono::NaiveDateTime) -> Self {
-        use chrono::Datelike;
-        use chrono::Timelike;
-        Self::new(
-            dt.second() as u64,
-            dt.minute() as u64,
-            dt.hour() as u64,
-            dt.day() as u64,
-            dt.month() as u64,
-            dt.year() as u64,
-        )
-    }
-
     pub fn new(second: u64, minute: u64, hour: u64, day: u64, month: u64, year: u64) -> Self {
         Self(second | (minute << 6) | (hour << 12) | (day << 17) | (month << 22) | (year << 26))
     }
diff --git a/rnex-core/src/nex/datastore.rs b/rnex-core/src/nex/datastore.rs
deleted file mode 100644
index 763bc3e..0000000
--- a/rnex-core/src/nex/datastore.rs
+++ /dev/null
@@ -1,785 +0,0 @@
-use cfg_if::cfg_if;
-cfg_if! {
-    if #[cfg(feature = "datastore")] {
-        use crate::define_rmc_proto;
-        use macros::rmc_struct;
-        use rnex_core::prudp::socket_addr::PRUDPSockAddr;
-        use std::sync::{Weak};
-        use chrono::Utc;
-        use sqlx::types::time;
-        use sqlx::types::time::PrimitiveDateTime;
-        use rnex_core::PID;
-        use rnex_core::nex::remote_console::RemoteConsole;
-        use rnex_core::nex::s3presigner::S3Presigner;
-        use rnex_core::rmc::response::ErrorCode;
-        use rnex_core::rmc::protocols::secure::{Secure, RawSecure, RawSecureInfo, RemoteSecure};
-        use rnex_core::rmc::protocols::datastore::{BufferQueueParam, CompletePostParam, DataStoreCustomRankingResult, DataStoreGetCustomRankingByDataIDParam, DataStorePrepareGetParam, DataStoreReqGetInfo, DataStoreSearchParam, GetMetaInfo, GetMetaParam, KeyValue, Permission, PersistenceTarget, RateCustomRankingParam, RatingInfo, RatingInfoWithSlot};
-        use rnex_core::rmc::protocols::datastore::{DataStore, RawDataStore, RawDataStoreInfo, RemoteDataStore, PreparePostParam, ReqPostInfo};
-        use crate::nex::user::User;
-        use rnex_core::executables::common::{RNEX_DATASTORE_S3_BUCKET, RNEX_DATASTORE_S3_ENDPOINT, get_db};
-        use rnex_core::rmc::structures::qbuffer::QBuffer;
-        use sqlx::types::chrono::DateTime;
-        use rnex_core::kerberos::KerberosDateTime;
-        use rnex_core::rmc::structures::qresult::QResult;
-
-        fn map_row_to_meta_info(
-            row_data_id: i64,
-            row_owner: i32,
-            row_size: i32,
-            row_name: String,
-            row_data_type: i16,
-            row_meta_binary: Vec<u8>,
-            row_permission: i16,
-            row_permission_recipients: Vec<i64>,
-            row_delete_permission: i16,
-            row_delete_permission_recipients: Vec<i64>,
-            row_period: i16,
-            row_refer_data_id: i64,
-            row_flag: i32,
-            row_tags: Vec<String>,
-            row_creation_date: chrono::NaiveDateTime,
-            row_update_date: chrono::NaiveDateTime,
-            ratings: Vec<RatingInfoWithSlot>
-        ) -> GetMetaInfo {
-            GetMetaInfo {
-                dataid: row_data_id as u64,
-                owner: row_owner as u32,
-                size: row_size as u32,
-                name: row_name,
-                data_type: row_data_type as u16,
-                meta_binary: QBuffer(row_meta_binary),
-                permission: Permission {
-                    permission: row_permission as u8,
-                    recipient_ids: row_permission_recipients.into_iter().map(|id| id as u32).collect(),
-                },
-                del_permission: Permission {
-                    permission: row_delete_permission as u8,
-                    recipient_ids: row_delete_permission_recipients.into_iter().map(|id| id as u32).collect(),
-                },
-                period: row_period as u16,
-                status: 0,
-                referred_count: 0,
-                refer_dat_id: row_refer_data_id as u32,
-                flag: row_flag as u32,
-                tags: row_tags,
-                expire_time: KerberosDateTime::from_u64(0x9C3F3E0000),
-                created_time: KerberosDateTime::from_naive(row_creation_date),
-                updated_time: KerberosDateTime::from_naive(row_update_date),
-                referred_time: KerberosDateTime::from_naive(row_creation_date),
-                ratings,
-            }
-        }
-
-        async fn check_object_availability(data_id: u64, password: u64) -> Result<(), ErrorCode> {
-            let row = sqlx::query!(
-                r#"
-                SELECT under_review, access_password
-                FROM datastore.objects
-                WHERE data_id = $1 AND upload_completed = TRUE AND deleted = FALSE
-                "#,
-                data_id as i64
-            )
-                .fetch_optional(get_db())
-                .await
-                .map_err(|e| {
-                    eprintln!("Availability check DB error: {:?}", e);
-                    ErrorCode::DataStore_SystemFileError
-                })?
-                .ok_or(ErrorCode::DataStore_NotFound)?;
-
-            let access_password = row.access_password as u64;
-            if access_password != 0 && access_password != password {
-                return Err(ErrorCode::DataStore_InvalidPassword);
-            }
-
-            if row.under_review {
-                return Err(ErrorCode::DataStore_UnderReviewing);
-            }
-
-            Ok(())
-        }
-
-        async fn get_object_ratings(data_id: u64, password: u64) -> Result<Vec<RatingInfoWithSlot>, ErrorCode> {
-            check_object_availability(data_id, password).await?;
-
-            let rows = sqlx::query!(
-                r#"
-                SELECT slot, total_value, count, initial_value
-                FROM datastore.object_ratings
-                WHERE data_id = $1
-                "#,
-                data_id as i64
-            )
-                .fetch_all(get_db())
-                .await
-                .map_err(|e| {
-                    eprintln!("Ratings fetch error: {:?}", e);
-                    ErrorCode::DataStore_SystemFileError
-                })?;
-
-            let ratings = rows.into_iter().map(|row| {
-                RatingInfoWithSlot {
-                    slot: row.slot as i8,
-                    rating: RatingInfo {
-                        total_value: row.total_value.unwrap_or(0),
-                        count: row.count as u32,
-                        initial_value: row.initial_value.unwrap_or(0),
-                    },
-                }
-            }).collect();
-
-            Ok(ratings)
-        }
-
-        async fn get_object_info_by_data_id(data_id: u64, password: u64) -> Result<GetMetaInfo, ErrorCode> {
-            check_object_availability(data_id, password).await?;
-
-            let row = sqlx::query!(
-                r#"SELECT data_id, owner, size, name, data_type, meta_binary,
-                          permission, permission_recipients, delete_permission, delete_permission_recipients,
-                          period, refer_data_id, flag, tags, creation_date, update_date
-                   FROM datastore.objects WHERE data_id = $1"#,
-                data_id as i64
-            )
-                .fetch_optional(get_db())
-                .await
-                .map_err(|_| ErrorCode::DataStore_SystemFileError)?
-                .ok_or(ErrorCode::DataStore_NotFound)?;
-
-            let ratings = get_object_ratings(data_id, password).await?;
-
-            Ok(map_row_to_meta_info(
-                row.data_id,
-                row.owner.unwrap_or(0),
-                row.size.unwrap_or(0),
-                row.name.unwrap_or_default(),
-                row.data_type.unwrap_or(0) as i16,
-                row.meta_binary.unwrap_or_default(),
-                row.permission.unwrap_or(0) as i16,
-                row.permission_recipients.unwrap_or_default().into_iter().map(|id| id as i64).collect(),
-                row.delete_permission.unwrap_or(0) as i16,
-                row.delete_permission_recipients.unwrap_or_default().into_iter().map(|id| id as i64).collect(),
-                row.period.unwrap_or(0) as i16,
-                row.refer_data_id.unwrap_or(0),
-                row.flag.unwrap_or(0),
-                row.tags.unwrap_or_default(),
-                row.creation_date.map(|dt| chrono::NaiveDateTime::new(
-                    chrono::NaiveDate::from_ymd_opt(dt.year(), dt.month() as u32, dt.day() as u32).unwrap(),
-                    chrono::NaiveTime::from_hms_opt(dt.hour() as u32, dt.minute() as u32, dt.second() as u32).unwrap()
-                )).unwrap_or_default(),
-                row.update_date.map(|dt| chrono::NaiveDateTime::new(
-                    chrono::NaiveDate::from_ymd_opt(dt.year(), dt.month() as u32, dt.day() as u32).unwrap(),
-                    chrono::NaiveTime::from_hms_opt(dt.hour() as u32, dt.minute() as u32, dt.second() as u32).unwrap()
-                )).unwrap_or_default(),
-                ratings
-            ))
-        }
-
-        async fn get_object_info_by_persistence_target(target: PersistenceTarget, password: u64) -> Result<GetMetaInfo, ErrorCode> {
-            let row = sqlx::query!(
-                r#"SELECT data_id, owner, size, name, data_type, meta_binary,
-                          permission, permission_recipients, delete_permission, delete_permission_recipients,
-                          period, refer_data_id, flag, tags, creation_date, update_date,
-                          access_password, under_review
-                   FROM datastore.objects
-                   WHERE owner = $1 AND persistence_slot_id = $2
-                   AND upload_completed = TRUE AND deleted = FALSE"#,
-                target.owner as i32,
-                target.persistence_slot_id as i16
-            )
-                .fetch_optional(get_db())
-                .await
-                .map_err(|_| ErrorCode::DataStore_SystemFileError)?
-                .ok_or(ErrorCode::DataStore_NotFound)?;
-
-            let db_password = row.access_password as u64;
-            if db_password != 0 && db_password != password {
-                return Err(ErrorCode::DataStore_InvalidPassword);
-            }
-
-            if row.under_review {
-                return Err(ErrorCode::DataStore_UnderReviewing);
-            }
-
-            let ratings = get_object_ratings(row.data_id as u64, password).await?;
-
-            Ok(map_row_to_meta_info(
-                row.data_id,
-                row.owner.unwrap_or(0),
-                row.size.unwrap_or(0),
-                row.name.unwrap_or_default(),
-                row.data_type.unwrap_or(0) as i16,
-                row.meta_binary.unwrap_or_default(),
-                row.permission.unwrap_or(0) as i16,
-                row.permission_recipients.unwrap_or_default().into_iter().map(|id| id as i64).collect(),
-                row.delete_permission.unwrap_or(0) as i16,
-                row.delete_permission_recipients.unwrap_or_default().into_iter().map(|id| id as i64).collect(),
-                row.period.unwrap_or(0) as i16,
-                row.refer_data_id.unwrap_or(0),
-                row.flag.unwrap_or(0),
-                row.tags.unwrap_or_default(),
-                row.creation_date.map(|dt| chrono::NaiveDateTime::new(
-                    chrono::NaiveDate::from_ymd_opt(dt.year(), dt.month() as u32, dt.day() as u32).unwrap(),
-                    chrono::NaiveTime::from_hms_opt(dt.hour() as u32, dt.minute() as u32, dt.second() as u32).unwrap()
-                )).unwrap_or_default(),
-                row.update_date.map(|dt| chrono::NaiveDateTime::new(
-                    chrono::NaiveDate::from_ymd_opt(dt.year(), dt.month() as u32, dt.day() as u32).unwrap(),
-                    chrono::NaiveTime::from_hms_opt(dt.hour() as u32, dt.minute() as u32, dt.second() as u32).unwrap()
-                )).unwrap_or_default(),
-                ratings
-            ))
-        }
-
-        async fn get_buffer_queues_by_data_id_and_slot(
-            data_id: u64,
-            slot: u32
-        ) -> Result<Vec<QBuffer>, ErrorCode> {
-            check_object_availability(data_id, 0).await?;
-
-            let rows = sqlx::query!(
-                r#"
-                SELECT buffer
-                FROM datastore.buffer_queues
-                WHERE data_id = $1 AND slot = $2
-                ORDER BY creation_date ASC
-                "#,
-                data_id as i64,
-                slot as i32
-            )
-                .fetch_all(get_db())
-                .await
-                .map_err(|e| {
-                    log::error!("Buffer queue fetch error: {:?}", e);
-                    ErrorCode::DataStore_SystemFileError
-                })?;
-
-            let buffer_queues = rows
-                .into_iter()
-                .map(|row| QBuffer(row.buffer))
-                .collect();
-
-            Ok(buffer_queues)
-        }
-
-        fn verify_object_permission(
-            owner_id: u32,
-            viewer_id: u32,
-            permission: &Permission,
-        ) -> Result<(), ErrorCode> {
-            if owner_id == viewer_id {
-                return Ok(());
-            }
-
-            match permission.permission {
-                0 => Ok(()), // All can read
-                1 => Err(ErrorCode::DataStore_PermissionDenied), // Friends only, unimplemented
-                2 => {
-                    // Recipient IDs can read
-                    if permission.recipient_ids.contains(&viewer_id) {
-                        Ok(())
-                    } else {
-                        Err(ErrorCode::DataStore_PermissionDenied)
-                    }
-                }
-                3 => Err(ErrorCode::DataStore_PermissionDenied), // Owner only, redundant
-                _ => Err(ErrorCode::DataStore_InvalidArgument), // ??? haxx0r
-            }
-        }
-
-        fn filter_properties_by_result_option(
-            meta_info: &mut GetMetaInfo,
-            result_option: u8,
-        ) {
-            if (result_option & 0x01) == 0 {
-                meta_info.meta_binary = QBuffer(Vec::new());
-            }
-
-            if (result_option & 0x04) == 0 {
-                meta_info.ratings = Vec::new();
-            }
-
-            // No idea what the other things do. :shrug:
-        }
-
-        // Dawg...
-        async fn get_custom_rankings_by_data_ids(
-            application_id: u32,
-            data_ids: Vec<u64>
-        ) -> Vec<DataStoreCustomRankingResult> {
-            let mut results = Vec::with_capacity(data_ids.len());
-
-            let rows = sqlx::query!(
-                r#"
-                SELECT
-                    rankings.data_id,
-                    rankings.value
-                FROM datastore.object_custom_rankings rankings
-                JOIN UNNEST($1::bigint[]) WITH ORDINALITY AS rows(data_id, ord)
-                    ON rankings.data_id = rows.data_id
-                    AND rankings.application_id = $2
-                ORDER BY rows.ord
-                "#,
-                &data_ids.iter().map(|&id| id as i64).collect::<Vec<i64>>(),
-                application_id as i32
-            )
-                .fetch_all(get_db())
-                .await;
-
-            let rows = match rows {
-                Ok(r) => r,
-                Err(e) => {
-                    log::error!("Custom ranking query error: {:?}", e);
-                    return results;
-                }
-            };
-
-            for row in rows {
-                let data_id = row.data_id as u64;
-                let score = row.value.unwrap_or(0) as u32;
-
-                if let Ok(meta) = get_object_info_by_data_id(data_id, 0).await {
-                    results.push(DataStoreCustomRankingResult {
-                        order: 0,
-                        score,
-                        meta_info: meta,
-                    });
-                } else {
-                    log::warn!("Could not find metadata for ranked object {}", data_id);
-                }
-            }
-
-            results
-        }
-
-        async fn get_user_course_object_ids(owner_pid: u32) -> Result<Vec<u64>, ErrorCode> {
-            let rows = sqlx::query!(
-                r#"
-                SELECT data_id
-                FROM datastore.objects
-                WHERE owner = $1 AND data_type > 2 AND data_type < 50
-                "#,
-                owner_pid as i64
-            )
-                .fetch_all(get_db())
-                .await
-                .map_err(|e| {
-                    log::error!("error fetching course IDs for PID {}: {:?}", owner_pid, e);
-                    ErrorCode::DataStore_SystemFileError
-                })?;
-
-            let mut valid_ids = Vec::new();
-            for row in rows {
-                let data_id = row.data_id as u64;
-                // always check avail
-                if check_object_availability(data_id, 0).await.is_ok() {
-                    valid_ids.push(data_id);
-                }
-            }
-
-            Ok(valid_ids)
-        }
-
-        fn get_blacklist_1() -> Vec<String> {
-            vec![
-                "けされ", "消され", "削除され", "リセットされ", "BANされ", "ＢＡＮされ",
-                "キミのコース", "君のコース", "きみのコース", "い い ね", "遊びます", "地震",
-                "震災", "被災", "津波", "バンされ", "い~ね", "震度", "じしん", "banされ",
-                "くわしくは", "詳しくは", "ちんちん", "ち0こ", "bicth", "い.い．ね",
-                "ナイ～ス", "い&い", "い-いね", "いぃね", "nigger", "ngger", "star if u",
-                "Star if u", "Star if you", "star if you", "PENlS", "マンコ", "butthole",
-                "LILI", "vagina", "vagyna", "うんち", "うんこ", "ウンコ", "Ｉｉｎｅ",
-                "EENE", "まんこ", "ウンチ", "niglet", "nigglet", "please like", "きんたま",
-                "Butthole", "llね", "iいね", "give a star", "ちんぽ", "亀頭", "penis",
-                "ｳﾝｺ", "plz more stars", "star plz", "い()ね", "PLEASE star", "Bitte Sterne",
-            ].into_iter().map(String::from).collect()
-        }
-
-        fn get_blacklist_2() -> Vec<String> {
-            vec![
-                "ゼロから", "０から", "0から", "い　　い　　ね", "いい", "東日本", "大震",
-            ].into_iter().map(String::from).collect()
-        }
-
-        fn get_blacklist_3() -> Vec<String> {
-            vec![
-                "いいね", "下さい", "ください", "押して", "おして", "返す", "かえす",
-                "星", "してくれ", "するよ", "☆くれたら", "☆あげます", "★くれたら",
-                "★あげます", "しね", "ころす", "ころされた", "アナル", "ファック",
-                "キンタマ", "○ね", "キチガイ", "うんこ", "KITIGAI", "金玉", "おっぱい",
-                "☆おす", "☆押す", "★おす", "★押す", "いいする", "いいよ", "イイネ",
-                "ケツ", "うんち", "かくせいざい", "覚せい剤", "シャブ", "きんたま",
-                "ちんちん", "おしっこ", "ちんぽこ", "ころして", "グッド", "グット",
-                "レ●プ", "バーカ", "きちがい", "ちんげ", "マンコ", "まんこ", "チンポ",
-                "クズ", "ウンコ", "ナイスおねがいします", "penis", "イイね", "☆よろ",
-                "ナイス!して", "ま/んこ", "まん/こ",
-            ].into_iter().map(String::from).collect()
-        }
-
-        impl DataStore for User {
-            async fn get_meta(&self, mut metaparam: GetMetaParam) -> Result<GetMetaInfo, ErrorCode> {
-                let mut meta_info = if metaparam.dataid != 0 {
-                    get_object_info_by_data_id(metaparam.dataid, metaparam.access_password).await?
-                } else {
-                    get_object_info_by_persistence_target(metaparam.persistence_target, metaparam.access_password).await?
-                };
-
-                let current_pid = self.pid;
-                verify_object_permission(meta_info.owner, current_pid, &meta_info.permission)?;
-
-                filter_properties_by_result_option(&mut meta_info, metaparam.result_option);
-
-                Ok(meta_info)
-            }
-
-            async fn prepare_post_object(&self, postparam: PreparePostParam) -> Result<ReqPostInfo, ErrorCode> {
-                let recipient_ids: Vec<i32> = postparam.permission.recipient_ids.iter().map(|&id| id as i32).collect();
-                let del_recipient_ids: Vec<i32> = postparam.del_permission.recipient_ids.iter().map(|&id| id as i32).collect();
-                let now = time::OffsetDateTime::now_utc();
-
-                let row = sqlx::query!(
-                        r#"
-                        INSERT INTO datastore.objects (
-                            owner, size, name, data_type, meta_binary,
-                            permission, permission_recipients,
-                            delete_permission, delete_permission_recipients,
-                            flag, period, refer_data_id, tags,
-                            persistence_slot_id, extra_data, creation_date, update_date
-                        ) VALUES (
-                            $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17
-                        ) RETURNING data_id
-                        "#,
-                        self.pid as i32,
-                        postparam.size as i32,
-                        postparam.name,
-                        postparam.data_type as i32,
-                        &postparam.meta_binary.0,
-                        postparam.permission.permission as i32,
-                        &recipient_ids,
-                        postparam.del_permission.permission as i32,
-                        &del_recipient_ids,
-                        postparam.flag as i32,
-                        postparam.period as i32,
-                        postparam.refer_data_id as i64,
-                        &postparam.tags,
-                        postparam.persistence_init_param.persistence_slot_id as i32,
-                        &postparam.extra_data,
-                        time::PrimitiveDateTime::new(now.date(), now.time()),
-                        time::PrimitiveDateTime::new(now.date(), now.time())
-                    )
-                    .fetch_one(get_db())
-                    .await
-                    .map_err(|e| {
-                        log::error!("DB Error: {:?}", e);
-                        ErrorCode::DataStore_SystemFileError
-                    })?;
-
-                let data_id = row.data_id as u64;
-                let presigner = S3Presigner::new(
-                    &format!("https://{}", *RNEX_DATASTORE_S3_ENDPOINT),
-                    format!("{}", *RNEX_DATASTORE_S3_BUCKET)
-                ).await;
-
-                let key = format!("data/{}.bin", data_id);
-
-                let (upload_url, fields) = presigner.generate_presigned_post(&key).await;
-
-                let form_fields = fields.into_iter().map(|(k, v)| {
-                    KeyValue { key: k, value: v }
-                }).collect();
-
-                Ok(ReqPostInfo {
-                    dataid: data_id,
-                    url: upload_url,
-                    request_headers: vec![],
-                    form_fields,
-                    root_ca_cert: vec![],
-                })
-            }
-
-            async fn complete_post_object(&self, completeparam: CompletePostParam) -> Result<(), ErrorCode> {
-                log::info!("Data ID: {:?}", completeparam.dataid);
-                log::info!("Success: {:?}", completeparam.success);
-
-                let record = sqlx::query!(
-                        r#"SELECT owner, under_review FROM datastore.objects WHERE data_id = $1"#,
-                        completeparam.dataid as i64
-                    )
-                    .fetch_optional(get_db())
-                    .await
-                    .map_err(|e| {
-                        eprintln!("select error: {:?}", e);
-                        ErrorCode::DataStore_SystemFileError
-                    })?;
-
-                let record = record.ok_or(ErrorCode::DataStore_NotFound)?;
-
-                if record.under_review {
-                    return Err(ErrorCode::DataStore_UnderReviewing);
-                }
-
-                if record.owner.unwrap_or(0) as u32 != self.pid {
-                    return Err(ErrorCode::DataStore_PermissionDenied);
-                }
-
-                if completeparam.success {
-                    sqlx::query!(
-                    r#"UPDATE datastore.objects SET upload_completed = true WHERE data_id = $1"#,
-                    completeparam.dataid as i64
-                )
-                        .execute(get_db())
-                        .await
-                        .map_err(|e| {
-                            eprintln!("update error: {:?}", e);
-                            ErrorCode::DataStore_SystemFileError
-                        })?;
-                } else {
-                    return Err(ErrorCode::Transport_TemporaryServerError);
-                }
-
-                Ok(())
-            }
-
-            async fn rate_custom_ranking(&self, rankingparam: Vec<RateCustomRankingParam>) -> Result<(), ErrorCode> {
-                for abcparam in rankingparam {
-                    let exists = sqlx::query_scalar!(
-                    r#"SELECT EXISTS(SELECT 1 FROM datastore.objects WHERE data_id = $1)"#,
-                    abcparam.dataid as i64
-                    )
-                        .fetch_one(get_db())
-                        .await
-                        .map_err(|_| ErrorCode::DataStore_SystemFileError)?;
-
-                    if !exists.unwrap_or(false) {
-                        return Err(ErrorCode::DataStore_NotFound);
-                    }
-
-                    sqlx::query!(
-                            r#"
-                            INSERT INTO datastore.object_custom_rankings (data_id, application_id, value)
-                            VALUES ($1, $2, $3)
-                            ON CONFLICT (data_id, application_id)
-                            DO UPDATE SET value = datastore.object_custom_rankings.value + EXCLUDED.value
-                            "#,
-                            abcparam.dataid as i64,
-                            abcparam.appid as i32,
-                            abcparam.score as i32
-                        )
-                        .execute(get_db())
-                        .await
-                        .map_err(|e| {
-                            log::error!("update/insert error: {:?}", e);
-                            ErrorCode::DataStore_SystemFileError
-                        })?;
-                }
-
-                Ok(())
-            }
-
-            async fn get_application_config(&self, appid: u32) -> Result<Vec<i32>, ErrorCode> {
-                const MAX_COURSE_UPLOADS: i32 = 100;
-
-                let config = match appid {
-                    0 => vec![
-                        0x00000001, 0x00000032, 0x00000096, 0x0000012c, 0x000001f4,
-                        0x00000320, 0x00000514, 0x000007d0, 0x00000bb8, 0x00001388,
-                        MAX_COURSE_UPLOADS, 0x00000014, 0x0000001e, 0x00000028, 0x00000032,
-                        0x0000003c, 0x00000046, 0x00000050, 0x0000005a, 0x00000064,
-                        0x00000023, 0x0000004b, 0x00000023, 0x0000004b, 0x00000032,
-                        0x00000000, 0x00000003, 0x00000003, 0x00000064, 0x00000006,
-                        0x00000001, 0x00000060, 0x00000005, 0x00000060, 0x00000000,
-                        0x000007e4, 0x00000001, 0x00000001, 0x0000000c, 0x00000000,
-                    ],
-                    1 => vec![
-                        2,
-                        1770179696,
-                        1770179664,
-                        1770179640,
-                        1770180827,
-                        1770180777,
-                        1770180745,
-                        1770177625,
-                        1770177590,
-                    ],
-                    2 => vec![0x000007df, 0x0000000c, 0x00000016, 0x00000005, 0x00000000],
-                    10 => vec![35, 75, 96, 40, 5, 6],
-                    _ => {
-                        log::error!("unknown SMM app id: {}", appid);
-                        return Err(ErrorCode::DataStore_Unknown);
-                    }
-                };
-
-                Ok(config)
-            }
-
-            async fn get_custom_ranking_by_data_id(
-                &self,
-                custom_ranking_param: DataStoreGetCustomRankingByDataIDParam
-            ) -> Result<(Vec<DataStoreCustomRankingResult>, Vec<QResult>), ErrorCode> {
-                println!("appid: {:?}", custom_ranking_param.application_id);
-                println!("dataid list: {:?}", custom_ranking_param.data_id_list);
-                println!("result option: {:?}", custom_ranking_param.result_option);
-
-                let mut ranking_results = get_custom_rankings_by_data_ids(custom_ranking_param.application_id, custom_ranking_param.data_id_list).await;
-
-                let mut q_results = Vec::with_capacity(ranking_results.len());
-
-                for result in &mut ranking_results {
-                    if (custom_ranking_param.result_option & 0x01) == 0 {
-                        result.meta_info.tags = Vec::new();
-                    }
-
-                    if (custom_ranking_param.result_option & 0x02) == 0 {
-                        result.meta_info.ratings = Vec::new();
-                    }
-
-                    if (custom_ranking_param.result_option & 0x04) == 0 {
-                        result.meta_info.meta_binary = QBuffer(Vec::new());
-                    }
-
-                    if (custom_ranking_param.result_option & 0x20) == 0 {
-                        result.score = 0;
-                    }
-
-                    q_results.push(QResult::success(ErrorCode::Core_Unknown));
-                }
-
-                Ok((ranking_results, q_results))
-            }
-
-            async fn get_buffer_queue(&self, bufferparam: BufferQueueParam) -> Result<Vec<QBuffer>, ErrorCode> {
-                // log::info!("GetBufferQueue: dataid={}, slot={}", param.dataid, param.slot);
-
-                let buffers = get_buffer_queues_by_data_id_and_slot(bufferparam.dataid, bufferparam.slot).await?;
-
-                Ok(buffers)
-            }
-
-            async fn prepare_get_object(&self, prepare_get_param: DataStorePrepareGetParam) -> Result<DataStoreReqGetInfo, ErrorCode> {
-                let meta_info = if prepare_get_param.dataid != 0 {
-                    get_object_info_by_data_id(prepare_get_param.dataid, prepare_get_param.access_password).await?
-                } else {
-                    get_object_info_by_persistence_target(prepare_get_param.persistence_target, prepare_get_param.access_password).await?
-                };
-
-                verify_object_permission(meta_info.owner, self.pid, &meta_info.permission)?;
-
-                let presigner = S3Presigner::new(
-                    &format!("https://{}", *RNEX_DATASTORE_S3_ENDPOINT),
-                    format!("{}", *RNEX_DATASTORE_S3_BUCKET)
-                ).await;
-
-                let key = format!("data/{}.bin", meta_info.dataid);
-                let download_url = presigner.generate_presigned_get(&key);
-
-                Ok(DataStoreReqGetInfo {
-                    url: download_url,
-                    request_headers: vec![],
-                    size: meta_info.size,
-                    root_ca_cert: vec![],
-                    dataid: meta_info.dataid,
-                })
-            }
-
-            async fn followings_latest_course_search_object(
-                &self,
-                course_search_param: DataStoreSearchParam,
-                _extra_data: Vec<String>
-            ) -> Result<Vec<DataStoreCustomRankingResult>, ErrorCode> {
-                let mut all_results = Vec::new();
-
-                for &owner_pid in &course_search_param.owner_ids {
-                    let course_ids = get_user_course_object_ids(owner_pid).await?;
-
-                    if course_ids.is_empty() {
-                        continue;
-                    }
-
-                    let mut results = get_custom_rankings_by_data_ids(0, course_ids).await;
-
-                    // Flag 0x1: Return Tags
-                    // Flag 0x2: Return Ratings
-                    // Flag 0x4: Return MetaBinary
-                    // Flag 0x20: Return Score
-                    for res in &mut results {
-                        if course_search_param.result_option & 0x1 == 0 {
-                            res.meta_info.tags = Vec::new();
-                        }
-                        if course_search_param.result_option & 0x2 == 0 {
-                            res.meta_info.ratings = Vec::new();
-                        }
-                        if course_search_param.result_option & 0x4 == 0 {
-                            res.meta_info.meta_binary = rnex_core::rmc::structures::qbuffer::QBuffer(Vec::new());
-                        }
-                        if course_search_param.result_option & 0x20 == 0 {
-                            res.score = 0;
-                        }
-                    }
-
-                    all_results.extend(results);
-                }
-
-                // note: we assume the client sorts the data lol
-
-                Ok(all_results)
-            }
-
-            async fn get_application_config_string(&self, application_id: u32) -> Result<Vec<String>, ErrorCode> {
-                let config = match application_id {
-                    128 => get_blacklist_1(),
-                    129 => get_blacklist_2(),
-                    130 => get_blacklist_3(),
-                    _ => {
-                        log::warn!("unsupported application_id in GetApplicationConfigString: {}", application_id);
-                        Vec::new()
-                    }
-                };
-
-                Ok(config)
-            }
-
-            async fn get_metas_multiple_param(
-                &self,
-                params: Vec<GetMetaParam>
-            ) -> Result<(Vec<GetMetaInfo>, Vec<QResult>), ErrorCode> {
-                let mut metas = Vec::with_capacity(params.len());
-                let mut results = Vec::with_capacity(params.len());
-
-                for param in params {
-                    let info_result = if param.dataid != 0 {
-                        get_object_info_by_data_id(param.dataid, param.access_password).await
-                    } else {
-                        get_object_info_by_persistence_target(param.persistence_target, param.access_password).await
-                    };
-
-                    match info_result {
-                        Ok(mut meta) => {
-                            if let Err(e) = verify_object_permission(meta.owner, self.pid, &meta.permission) {
-                                metas.push(GetMetaInfo::default());
-                                results.push(QResult::error(e));
-                            } else {
-                                if param.result_option & 0x1 == 0 {
-                                    meta.tags = Vec::new();
-                                }
-                                if param.result_option & 0x2 == 0 {
-                                    meta.ratings = Vec::new();
-                                }
-                                if param.result_option & 0x4 == 0 {
-                                    meta.meta_binary = rnex_core::rmc::structures::qbuffer::QBuffer(Vec::new());
-                                }
-
-                                metas.push(meta);
-                                results.push(QResult::success(ErrorCode::Core_Unknown));
-                            }
-                        }
-                        Err(e) => {
-                            metas.push(GetMetaInfo::default());
-                            results.push(QResult::error(e));
-                        }
-                    }
-                }
-
-                Ok((metas, results))
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/rnex-core/src/nex/mod.rs b/rnex-core/src/nex/mod.rs
index ba92c5d..79c2085 100644
--- a/rnex-core/src/nex/mod.rs
+++ b/rnex-core/src/nex/mod.rs
@@ -13,10 +13,3 @@ cfg_if! {
         pub mod user;
     }
 }
-
-cfg_if! {
-    if #[cfg(feature = "datastore")] {
-        pub mod s3presigner;
-        pub mod datastore;
-    }
-}
diff --git a/rnex-core/src/nex/s3presigner.rs b/rnex-core/src/nex/s3presigner.rs
deleted file mode 100644
index afe61d4..0000000
--- a/rnex-core/src/nex/s3presigner.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use aws_sdk_s3::presigning::PresigningConfig;
-use base64::{engine::general_purpose, Engine as _};
-use hmac::{Hmac, Mac};
-use sha2::{Sha256, Digest};
-use chrono::{Utc, Duration};
-use serde_json::json;
-use rnex_core::executables::common::RNEX_DATASTORE_S3_ENDPOINT;
-
-pub struct S3Presigner {
-    endpoint: String,
-    bucket: String,
-}
-
-impl S3Presigner {
-    pub async fn new(endpoint: &str, bucket: String) -> Self {
-        Self {
-            endpoint: endpoint.trim_end_matches('/').to_string(),
-            bucket,
-        }
-    }
-    pub async fn generate_presigned_post(&self, key: &str) -> (String, Vec<(String, String)>) {
-        let access_key = std::env::var("AWS_ACCESS_KEY_ID").expect("Missing Access Key");
-        let secret_key = std::env::var("AWS_SECRET_ACCESS_KEY").expect("Missing Secret Key");
-        let region = "us-east-1"; // hardcoded because its the default region for most s3 clones
-        let date_short = Utc::now().format("%Y%m%d").to_string();
-        let date_full = Utc::now().format("%Y%m%dT%H%M%SZ").to_string();
-        let expiration = (Utc::now() + Duration::minutes(15)).format("%Y-%m-%dT%H:%M:%SZ").to_string();
-
-        let credential = format!("{}/{}/{}/s3/aws4_request", access_key, date_short, region);
-
-        let policy_json = json!({
-            "expiration": expiration,
-            "conditions": [
-                {"bucket": self.bucket},
-                ["starts-with", "$key", key],
-                {"x-amz-credential": credential},
-                {"x-amz-algorithm": "AWS4-HMAC-SHA256"},
-                {"x-amz-date": date_full}
-            ]
-        });
-
-        let policy_base64 = general_purpose::STANDARD.encode(policy_json.to_string());
-
-        let signature = self.calculate_signature(&secret_key, &date_short, region, &policy_base64);
-
-        let mut fields = vec![
-            ("key".to_string(), key.to_string()),
-            ("X-Amz-Algorithm".to_string(), "AWS4-HMAC-SHA256".to_string()),
-            ("X-Amz-Credential".to_string(), credential),
-            ("X-Amz-Date".to_string(), date_full),
-            ("Policy".to_string(), policy_base64),
-            ("X-Amz-Signature".to_string(), signature),
-        ];
-
-        let url = format!("https://{}/{}", *RNEX_DATASTORE_S3_ENDPOINT, self.bucket);
-        (url, fields)
-    }
-
-    pub fn generate_presigned_get(&self, key: &str) -> String {
-        let access_key = std::env::var("AWS_ACCESS_KEY_ID").expect("Missing Access Key");
-        let secret_key = std::env::var("AWS_SECRET_ACCESS_KEY").expect("Missing Secret Key");
-        let region = "us-east-1";
-        let date_short = Utc::now().format("%Y%m%d").to_string();
-        let date_full = Utc::now().format("%Y%m%dT%H%M%SZ").to_string();
-
-        let credential_scope = format!("{}/{}/s3/aws4_request", date_short, region);
-
-        let query_string = format!(
-            "X-Amz-Algorithm=AWS4-HMAC-SHA256&\
-             X-Amz-Credential={}%2F{}&\
-             X-Amz-Date={}&\
-             X-Amz-Expires=900&\
-             X-Amz-SignedHeaders=host",
-            access_key,
-            urlencoding::encode(&credential_scope),
-            date_full
-        );
-
-        let canonical_request = format!(
-            "GET\n/{}/{}\n{}\nhost:{}\n\nhost\nUNSIGNED-PAYLOAD",
-            self.bucket, key, query_string, *RNEX_DATASTORE_S3_ENDPOINT
-        );
-
-        let hashed_request = hex::encode(Sha256::digest(canonical_request.as_bytes()));
-
-        let string_to_sign = format!(
-            "AWS4-HMAC-SHA256\n{}\n{}\n{}",
-            date_full, credential_scope, hashed_request
-        );
-
-        let k_date = self.hmac_sha256(format!("AWS4{}", secret_key).as_bytes(), &date_short);
-        let k_region = self.hmac_sha256(&k_date, region);
-        let k_service = self.hmac_sha256(&k_region, "s3");
-        let k_signing = self.hmac_sha256(&k_service, "aws4_request");
-        let signature = hex::encode(self.hmac_sha256(&k_signing, &string_to_sign));
-
-        format!(
-            "https://{}/{}/{}?{}&X-Amz-Signature={}",
-            *RNEX_DATASTORE_S3_ENDPOINT, self.bucket, key, query_string, signature
-        )
-    }
-
-    fn calculate_signature(&self, secret: &str, date: &str, region: &str, policy: &str) -> String {
-        let k_date = self.hmac_sha256(format!("AWS4{}", secret).as_bytes(), date);
-        let k_region = self.hmac_sha256(&k_date, region);
-        let k_service = self.hmac_sha256(&k_region, "s3");
-        let k_signing = self.hmac_sha256(&k_service, "aws4_request");
-
-        hex::encode(self.hmac_sha256(&k_signing, policy))
-    }
-
-    fn hmac_sha256(&self, key: &[u8], data: &str) -> Vec<u8> {
-        let mut mac = Hmac::<Sha256>::new_from_slice(key).expect("HMAC can take key of any size");
-        mac.update(data.as_bytes());
-        mac.finalize().into_bytes().to_vec()
-    }
-}
\ No newline at end of file
diff --git a/rnex-core/src/nex/user.rs b/rnex-core/src/nex/user.rs
index 1239452..052ab53 100644
--- a/rnex-core/src/nex/user.rs
+++ b/rnex-core/src/nex/user.rs
@@ -23,7 +23,6 @@ use rnex_core::rmc::protocols::matchmake_extension::{
 };
 use rnex_core::rmc::protocols::ranking::{Ranking, RawRanking, RawRankingInfo, RemoteRanking};
 use rnex_core::rmc::protocols::secure::{RawSecure, RawSecureInfo, RemoteSecure, Secure};
-use rnex_core::rmc::protocols::datastore::{DataStore, RawDataStore, RawDataStoreInfo, RemoteDataStore};
 use rnex_core::rmc::response::ErrorCode;
 use rnex_core::rmc::structures::any::Any;
 use rnex_core::rmc::structures::matchmake::{
@@ -45,37 +44,18 @@ use rnex_core::rmc::structures::qbuffer::QBuffer;
 use rnex_core::rmc::structures::qresult::QResult;
 use rnex_core::rmc::structures::ranking::UploadCompetitionData;
 use std::sync::{Arc, Weak};
-use cfg_if::cfg_if;
-use rnex_core::rmc::protocols::ranking::{CompetitionRankingScoreData, CompetitionRankingGetParam, CompetitionRankingScoreInfo};
-use rnex_core::rmc::structures::ranking::{UploadCompetitionData};
 use tokio::sync::{Mutex, RwLock};
 
-cfg_if! {
-    if #[cfg(feature = "datastore")] {
-        define_rmc_proto!(
-            proto UserProtocol{
-                Secure,
-                MatchmakeExtension,
-                MatchmakeExt,
-                Matchmake,
-                NatTraversal,
-                Ranking,
-                DataStore
-            }
-        );
-    } else {
-        define_rmc_proto!(
-            proto UserProtocol{
-                Secure,
-                MatchmakeExtension,
-                MatchmakeExt,
-                Matchmake,
-                NatTraversal,
-                Ranking
-            }
-        );
+define_rmc_proto!(
+    proto UserProtocol{
+        Secure,
+        MatchmakeExtension,
+        MatchmakeExt,
+        Matchmake,
+        NatTraversal,
+        Ranking
     }
-}
+);
 
 #[rmc_struct(UserProtocol)]
 pub struct User {
diff --git a/rnex-core/src/rmc/protocols/datastore.rs b/rnex-core/src/rmc/protocols/datastore.rs
deleted file mode 100644
index 0c68fc5..0000000
--- a/rnex-core/src/rmc/protocols/datastore.rs
+++ /dev/null
@@ -1,240 +0,0 @@
-use macros::{method_id, rmc_proto, RmcSerialize, rmc_struct};
-use rnex_core::rmc::structures::qbuffer::QBuffer;
-use rnex_core::rmc::response::ErrorCode;
-use rnex_core::rmc::structures::qresult::QResult;
-use rnex_core::kerberos::KerberosDateTime;
-use rnex_core::PID;
-use rnex_core::rmc::structures::resultsrange::ResultsRange;
-
-#[derive(RmcSerialize, Clone, Debug, Default)]
-#[rmc_struct(0)]
-pub struct PersistenceTarget {
-    pub owner: PID,
-    pub persistence_slot_id: u16,
-}
-
-#[derive(RmcSerialize, Clone, Debug, Default)]
-#[rmc_struct(0)]
-pub struct Permission {
-    pub permission: u8,
-    pub recipient_ids: Vec<PID>,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct RatingInfoWithSlot {
-    pub slot: i8,
-    pub rating: RatingInfo,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct RatingInfo {
-    pub total_value: i64,
-    pub count: u32,
-    pub initial_value: i64,
-}
-
-#[derive(RmcSerialize, Clone, Default)]
-#[rmc_struct(0)]
-pub struct GetMetaParam {
-    pub dataid: u64,
-    pub persistence_target: PersistenceTarget,
-    pub result_option: u8,
-    pub access_password: u64,
-}
-
-#[derive(RmcSerialize, Clone, Default)]
-#[rmc_struct(0)]
-pub struct GetMetaInfo {
-    pub dataid: u64,
-    pub owner: PID,
-    pub size: u32,
-    pub name: String,
-    pub data_type: u16,
-    pub meta_binary: QBuffer,
-    pub permission: Permission,
-    pub del_permission: Permission,
-    pub created_time: KerberosDateTime,
-    pub updated_time: KerberosDateTime,
-    pub period: u16,
-    pub status: u8,
-    pub referred_count: u32,
-    pub refer_dat_id: u32,
-    pub flag: u32,
-    pub referred_time: KerberosDateTime,
-    pub expire_time: KerberosDateTime,
-    pub tags: Vec<String>,
-    pub ratings: Vec<RatingInfoWithSlot>,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct RatingInitParam {
-    pub flag: u8,
-    pub internal_flag: u8,
-    pub lock_type: u8,
-    pub intial_valie: i64,
-    pub range_min: i32,
-    pub range_max: i32,
-    pub period_hour: i8,
-    pub period_duration: i16
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct RatingInitParamWithSlot {
-    pub slot: i8,
-    pub param: RatingInitParam,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct PersistenceInitParam {
-    pub persistence_slot_id: u16,
-    pub delete_last_object: bool,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct KeyValue {
-    pub key: String,
-    pub value: String,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct PreparePostParam {
-    pub size: u32,
-    pub name: String,
-    pub data_type: u16,
-    pub meta_binary: QBuffer,
-    pub permission: Permission,
-    pub del_permission: Permission,
-    pub flag: u32,
-    pub period: u16,
-    pub refer_data_id: u32,
-    pub tags: Vec<String>,
-    pub rating_init_params: Vec<RatingInitParamWithSlot>,
-    pub persistence_init_param: PersistenceInitParam,
-    pub extra_data: Vec<String>,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct ReqPostInfo {
-    pub dataid: u64,
-    pub url: String,
-    pub request_headers: Vec<KeyValue>,
-    pub form_fields: Vec<KeyValue>,
-    pub root_ca_cert: Vec<u8>,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct CompletePostParam {
-    pub dataid: u64,
-    pub success: bool,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct RateCustomRankingParam {
-    pub dataid: u64,
-    pub appid: u32,
-    pub score: u32,
-    pub period: u16,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct BufferQueueParam {
-    pub dataid: u64,
-    pub slot: u32,
-}
-
-// I just realized I forgot to add "DataStore" in front of the structs. I can't be assed to change it, sucks to be you lol.
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct DataStoreGetCustomRankingByDataIDParam {
-    pub application_id: u32,
-    pub data_id_list: Vec<u64>,
-    pub result_option: u8,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct DataStoreCustomRankingResult {
-    pub order: u32,
-    pub score: u32,
-    pub meta_info: GetMetaInfo,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct DataStorePrepareGetParam {
-    pub dataid: u64,
-    pub lockid: u32,
-    pub persistence_target: PersistenceTarget,
-    pub access_password: u64,
-    pub extra_data: Vec<String>,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(0)]
-pub struct DataStoreReqGetInfo {
-    pub url: String,
-    pub request_headers: Vec<KeyValue>,
-    pub size: u32,
-    pub root_ca_cert: Vec<u8>,
-    pub dataid: u64,
-}
-
-#[derive(RmcSerialize, Clone)]
-#[rmc_struct(1)]
-pub struct DataStoreSearchParam {
-    pub search_target: u8,
-    pub owner_ids: Vec<PID>,
-    pub owner_type: u8,
-    pub destination_ids: Vec<u64>,
-    pub data_type: u16,
-    pub created_after: KerberosDateTime,
-    pub created_before: KerberosDateTime,
-    pub updated_after: KerberosDateTime,
-    pub updated_before: KerberosDateTime,
-    pub refer_dat_id: u32,
-    pub tags: Vec<String>,
-    pub result_order_column: u8,
-    pub result_order: u8,
-    pub result_range: ResultsRange,
-    pub result_option: u8,
-    pub minimal_rating_frequency: u32,
-    pub use_cache: bool,
-}
-
-#[rmc_proto(115)]
-pub trait DataStore{
-    #[method_id(8)]
-    async fn get_meta(&self, metaparam: GetMetaParam) -> Result<GetMetaInfo, ErrorCode>;
-    #[method_id(36)]
-    async fn get_metas_multiple_param(&self, params: Vec<GetMetaParam>) -> Result<(Vec<GetMetaInfo>, Vec<QResult>), ErrorCode>;
-    #[method_id(24)]
-    async fn prepare_post_object(&self, postparam: PreparePostParam) -> Result<ReqPostInfo, ErrorCode>;
-    #[method_id(26)]
-    async fn complete_post_object(&self, completeparam: CompletePostParam) -> Result<(), ErrorCode>;
-    #[method_id(48)]
-    async fn rate_custom_ranking(&self, rankingparam: Vec<RateCustomRankingParam>) -> Result<(), ErrorCode>;
-    #[method_id(61)]
-    async fn get_application_config(&self, appid: u32) -> Result<Vec<i32>, ErrorCode>;
-    #[method_id(50)]
-    async fn get_custom_ranking_by_data_id(&self, custom_ranking_param: DataStoreGetCustomRankingByDataIDParam) -> Result<(Vec<DataStoreCustomRankingResult>, Vec<QResult>), ErrorCode>;
-    #[method_id(54)]
-    async fn get_buffer_queue(&self, bufferparam: BufferQueueParam) -> Result<Vec<QBuffer>, ErrorCode>;
-    #[method_id(25)]
-    async fn prepare_get_object(&self, prepare_get_param: DataStorePrepareGetParam) -> Result<DataStoreReqGetInfo, ErrorCode>;
-    #[method_id(65)]
-    async fn followings_latest_course_search_object(&self, course_search_param: DataStoreSearchParam, extra_data: Vec<String>) -> Result<Vec<DataStoreCustomRankingResult>, ErrorCode>;
-    #[method_id(74)]
-    async fn get_application_config_string(&self, application_id: u32) -> Result<Vec<String>, ErrorCode>;
-}
\ No newline at end of file
diff --git a/rnex-core/src/rmc/protocols/mod.rs b/rnex-core/src/rmc/protocols/mod.rs
index a34b265..eed0597 100644
--- a/rnex-core/src/rmc/protocols/mod.rs
+++ b/rnex-core/src/rmc/protocols/mod.rs
@@ -11,7 +11,6 @@ pub mod nintendo_notification;
 pub mod notifications;
 pub mod ranking;
 pub mod secure;
-pub mod datastore;
 
 use crate::result::ResultExtension;
 use crate::rmc::message::RMCMessage;
diff --git a/rnex-core/src/rmc/protocols/ranking.rs b/rnex-core/src/rmc/protocols/ranking.rs
index 68be98f..eff1ae4 100644
--- a/rnex-core/src/rmc/protocols/ranking.rs
+++ b/rnex-core/src/rmc/protocols/ranking.rs
@@ -2,10 +2,17 @@ use macros::{RmcSerialize, method_id, rmc_proto};
 
 use rnex_core::kerberos::KerberosDateTime;
 use rnex_core::rmc::structures::qbuffer::QBuffer;
-use rnex_core::rmc::structures::resultsrange::ResultsRange;
+
 use rnex_core::rmc::response::ErrorCode;
 use rnex_core::rmc::structures::ranking::UploadCompetitionData;
 
+#[derive(RmcSerialize, Debug, Default, Clone)]
+#[rmc_struct(0)]
+pub struct ResultsRange {
+    pub offset: u32,
+    pub size: u32,
+}
+
 #[derive(RmcSerialize, Debug, Default, Clone)]
 #[rmc_struct(1)]
 pub struct CompetitionRankingGetParam {
diff --git a/rnex-core/src/rmc/structures/mod.rs b/rnex-core/src/rmc/structures/mod.rs
index 33de120..35dce08 100644
--- a/rnex-core/src/rmc/structures/mod.rs
+++ b/rnex-core/src/rmc/structures/mod.rs
@@ -38,7 +38,6 @@ pub mod ranking;
 pub mod rmc_struct;
 pub mod string;
 pub mod variant;
-pub mod resultsrange;
 
 pub trait RmcSerialize {
     fn serialize(&self, writer: &mut impl Write) -> Result<()>;
diff --git a/rnex-core/src/rmc/structures/qbuffer.rs b/rnex-core/src/rmc/structures/qbuffer.rs
index 7f2aa7b..2f7b23a 100644
--- a/rnex-core/src/rmc/structures/qbuffer.rs
+++ b/rnex-core/src/rmc/structures/qbuffer.rs
@@ -3,7 +3,7 @@ use bytemuck::bytes_of;
 use v_byte_helpers::{IS_BIG_ENDIAN, ReadExtensions};
 use crate::rmc::structures::{Result, RmcSerialize};
 
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct QBuffer(pub Vec<u8>);
 
 impl RmcSerialize for QBuffer{
diff --git a/rnex-core/src/rmc/structures/resultsrange.rs b/rnex-core/src/rmc/structures/resultsrange.rs
deleted file mode 100644
index ba62e49..0000000
--- a/rnex-core/src/rmc/structures/resultsrange.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use macros::RmcSerialize;
-
-#[derive(RmcSerialize, Debug, Default, Clone)]
-#[rmc_struct(0)]
-pub struct ResultsRange{
-    pub offset: u32,
-    pub size: u32
-}
\ No newline at end of file