2026-09-01 06:28:11 +00:00
151 changed files with 1203 additions and 4969 deletions
--- a/.github/workflows/dependency-graph.yml
+++ b/.github/workflows/dependency-graph.yml
@ -1,27 +0,0 @@
-name: dependency-graph
-
-on:
-  push:
-    branches:
-      - "**"
-
-permissions: {}
-
-jobs:
-  submit-dependency-graph:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v6
-      - name: Set up JDK
-        uses: actions/setup-java@v5
-        with:
-          distribution: 'zulu'
-          java-version: '25'
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
-        with:
-          dependency-graph: generate-and-submit
-      - name: Generate dependency graph
-        run: ./gradlew --no-daemon dependencies
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -35,19 +35,45 @@ jobs:
          mv ./signal-cli-archive-${{ env.ARCHIVE_JAVA_VERSION }}/* .
          echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT

-      - name: Create draft release and upload assets
+      - name: Create release
+        id: create_release
+        uses: actions/create-release@v1
        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release create "v${{ steps.version.outputs.version }}" \
-            --repo "${{ github.repository }}" \
-            --title "v${{ steps.version.outputs.version }}" \
-            --draft \
-            --verify-tag \
-            "signal-cli-${{ steps.version.outputs.version }}.tar.gz" \
-            "signal-cli-${{ steps.version.outputs.version }}-Linux-native.tar.gz" \
-            "signal-cli-${{ steps.version.outputs.version }}-Linux-client.tar.gz" \
-            "signal-cli-${{ steps.version.outputs.version }}-json-schemas.tar.gz"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: v${{ steps.version.outputs.version }} # note: added `v`
+          release_name: v${{ steps.version.outputs.version }} # note: added `v`
+          draft: true
+
+      - name: Upload archive
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: signal-cli-${{ steps.version.outputs.version }}.tar.gz
+          asset_name: signal-cli-${{ steps.version.outputs.version }}.tar.gz
+          asset_content_type: application/x-compressed-tar # .tar.gz
+
+      - name: Upload Linux native archive
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: signal-cli-${{ steps.version.outputs.version }}-Linux-native.tar.gz
+          asset_name: signal-cli-${{ steps.version.outputs.version }}-Linux-native.tar.gz
+          asset_content_type: application/x-compressed-tar # .tar.gz
+
+      - name: Upload Linux client archive
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: signal-cli-${{ steps.version.outputs.version }}-Linux-client.tar.gz
+          asset_name: signal-cli-${{ steps.version.outputs.version }}-Linux-client.tar.gz
+          asset_content_type: application/x-compressed-tar # .tar.gz

  build-container:
    needs: release
@ -68,7 +94,7 @@ jobs:

      - name: Build Image
        id: build_image
-        uses: redhat-actions/buildah-build@v3
+        uses: redhat-actions/buildah-build@v2
        with:
          image: ${{ env.IMAGE_NAME }}
          tags: latest ${{ github.sha }} ${{ needs.release.outputs.version }}
@ -76,7 +102,7 @@ jobs:
          oci: true

      - name: Push To GHCR
-        uses: redhat-actions/push-to-registry@v3
+        uses: redhat-actions/push-to-registry@v2
        id: push
        with:
          image: ${{ steps.build_image.outputs.image }}
@ -109,7 +135,7 @@ jobs:

      - name: Build Image
        id: build_image
-        uses: redhat-actions/buildah-build@v3
+        uses: redhat-actions/buildah-build@v2
        with:
          image: ${{ env.IMAGE_NAME }}
          tags: latest-native ${{ github.sha }}-native ${{ needs.release.outputs.version }}-native
@ -117,7 +143,7 @@ jobs:
          oci: true

      - name: Push To GHCR
-        uses: redhat-actions/push-to-registry@v3
+        uses: redhat-actions/push-to-registry@v2
        id: push
        with:
          image: ${{ steps.build_image.outputs.image }}
@ -150,7 +176,7 @@ jobs:

      - name: Build Image
        id: build_image
-        uses: redhat-actions/buildah-build@v3
+        uses: redhat-actions/buildah-build@v2
        with:
          image: ${{ env.IMAGE_NAME }}
          tags: latest-client ${{ github.sha }}-client ${{ needs.release.outputs.version }}-client
@ -158,7 +184,7 @@ jobs:
          oci: true

      - name: Push To GHCR
-        uses: redhat-actions/push-to-registry@v3
+        uses: redhat-actions/push-to-registry@v2
        id: push
        with:
          image: ${{ steps.build_image.outputs.image }}
--- a/.gitignore
+++ b/.gitignore
@ -20,4 +20,3 @@ man/*.1
 man/*.5
 man/man1
 man/man5
-.superpowers/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,66 +1,5 @@
 # Changelog

-## [Unreleased]
-
-## [0.14.7] - 2026-08-01
-
-### Added
-
- Sync installed sticker packs via storage sync
-
-### Improved
-
- Set width/height for outgoing image attachments (Thanks @mikesimone)
- Update to new registration/provisioning API
-
-### Fixed
-
- Removing self from pending group invite now works if invited via PNI
- Correctly set needs PNI signature for recipients
- Fix linking after previous unsuccessful link attempt
-
-## [0.14.6] - 2026-07-12
-
-### Added
-
- New `sendStory` command to post file attachment stories to "My Story" or to a group via `--group-id`
-
-### Improved
-
- The account parameter `-a` now supports ACI in addition to phone number
- Disabling read receipts in configuration now prevents sending read receipts (only sync message to linked devices is still sent)
-
-### Fixed
-
- Sending to large groups is no longer slowed down by members that are already known to be unregistered; they are skipped instead of being retried via the legacy 1:1 send path on every send.
-
-## [0.14.5] - 2026-06-11
-
-### Changed
-
- Disable host validation when binding on 0.0.0.0
- Use new SVR2 enclave for PINs
-
-### Fixed
-
- Receiving unidentified sender messages after signal server change
-
-## [0.14.4] - 2026-05-23
-
-### Added
-
- Support for a global configuration file to set system-wide defaults
-
-### Fixed
-
- Group admins can now see profile information for users requesting to join groups.
- Storage sync with unregistered contacts fixed
- Incoming messages are validated more accurately, fixing receiving messages from new contacts
-
-### Improved
-
- Some security and stability improvements, including HTTP HOST header validation and safer temporary file handling.
-
 ## [0.14.3] - 2026-04-22

 ### Fixed
--- a/README.md
+++ b/README.md
@ -3,7 +3,7 @@
 signal-cli is a commandline interface for the [Signal messenger](https://signal.org/).
 It supports registering, verifying, sending and receiving messages.
 signal-cli uses a [patched libsignal-service-java](https://github.com/Turasa/libsignal-service-java),
-extracted from the [Signal-Android source code](https://github.com/signalapp/Signal-Android/tree/main/lib/libsignal-service).
+extracted from the [Signal-Android source code](https://github.com/signalapp/Signal-Android/tree/main/libsignal-service).
 For registering you need a phone number where you can receive SMS or incoming calls.

 signal-cli is primarily intended to be used on servers to notify admins of important events.
@ -64,20 +64,8 @@ Important: The ACCOUNT is your phone number in international format and must inc
 should start with a "+" sign. (See [Wikipedia](https://en.wikipedia.org/wiki/List_of_country_calling_codes) for a list
 of all country codes.)

-* Link to an existing account
-
-  If you have an existing Signal account associated
-  with a number, you can link signal-cli to it with:
-
-      signal-cli link
-
 * Register a number (with SMS verification)

-  Alternatively, if you don't have an existing Signal
-  account, you can register one from signal-cli. Note
-  that this will unregister any existing client
-  associated with the same number.
-
      signal-cli -a ACCOUNT register

  You can register Signal using a landline number. In this case, you need to follow the procedure below:
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -5,12 +5,12 @@ plugins {
    application
    eclipse
    `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "1.1.9"
+    id("org.graalvm.buildtools.native") version "1.0.0"
 }

 allprojects {
    group = "org.asamk"
-    version = "0.14.8"
+    version = "0.14.3"
 }

 java {
@ -74,7 +74,7 @@ val excludePatterns = mapOf(
    )
 )

-val schemaAnnotationProcessor = configurations.create("schemaAnnotationProcessor") {
+val schemaAnnotationProcessor by configurations.creating {
    isCanBeConsumed = false
    isCanBeResolved = true
 }
@ -102,7 +102,7 @@ dependencies {
    implementation(libs.micronaut.json.schema.annotations)
    if (gradle.startParameter.taskNames.any { it.contains("jsonSchemas") }) {
        implementation(libs.micronaut.json.schema.generator)
-    }
+    }    
    implementation(project(":libsignal-cli"))

    testImplementation(libs.junit.jupiter)
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@ -7,11 +7,11 @@ plugins {
 }

 tasks.named<KotlinCompilationTask<KotlinJvmCompilerOptions>>("compileKotlin").configure {
-    compilerOptions.jvmTarget.set(JvmTarget.JVM_25)
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_24)
 }

 java {
-    targetCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_24
 }

 repositories {
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@ -912,9 +912,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"

 [[package]]
 name = "rustls-webpki"
-version = "0.103.13"
+version = "0.103.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
+checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06"
 dependencies = [
 "ring",
 "rustls-pki-types",
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@ -45,18 +45,6 @@
        <content_attribute id="social-chat">intense</content_attribute>
    </content_rating>
    <releases>
-        <release version="0.14.7" date="2026-08-01">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.14.7</url>
-        </release>
-        <release version="0.14.6" date="2026-07-12">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.14.6</url>
-        </release>
-        <release version="0.14.5" date="2026-06-11">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.14.5</url>
-        </release>
-        <release version="0.14.4" date="2026-05-23">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.14.4</url>
-        </release>
        <release version="0.14.3" date="2026-04-22">
            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.14.3</url>
        </release>
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@ -1,14 +1,12 @@
 [versions]
-slf4j = "2.0.18"
-coroutines = "1.10.2"
-junit = "6.1.2"
-micronaut-json-schema = "2.1.0"
-micronaut-core = "5.1.10"
-signal-service = "2.15.3_unofficial_152"
+slf4j = "2.0.17"
+junit = "6.0.3"
+micronaut-json-schema = "2.0.0-M8"
+micronaut-core = "4.9.3"

 [libraries]
-bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.85"
-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.22.1"
+bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.84"
+jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.20.2"
 argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
 dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
 zxing = "com.google.zxing:core:3.5.4"
@ -18,12 +16,11 @@ micronaut-json-schema-generator = { module = "io.micronaut.jsonschema:micronaut-
 micronaut-inject-java = { module = "io.micronaut:micronaut-inject-java", version.ref = "micronaut-core" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
-logback = "ch.qos.logback:logback-classic:1.6.1"
+logback = "ch.qos.logback:logback-classic:1.5.32"

-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
-signalnetwork = { module = "com.github.turasa:signal-network", version.ref = "signal-service" }
-sqlite = "org.xerial:sqlite-jdbc:3.53.2.1"
-hikari = "com.zaxxer:HikariCP:7.1.0"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_144"
+sqlite = "org.xerial:sqlite-jdbc:3.53.0.0"
+hikari = "com.zaxxer:HikariCP:7.0.2"
 junit-jupiter-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
 junit-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit" }
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,9 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
-retries=0
-retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/6
+++ b/6
@ -20,7 +20,7 @@

 ##############################################################################
 #
-#   gradlew start up script for POSIX generated by Gradle.
+#   Gradle start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh gradlew
+#           ksh Gradle
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/<unknown>/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
--- a/gradlew.bat
+++ b/gradlew.bat
@ -19,12 +19,12 @@
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
-@rem  gradlew startup script for Windows
+@rem  Gradle startup script for Windows
@rem
@rem ##########################################################################

-@rem Set local scope for the variables, and ensure extensions are enabled
-setlocal EnableExtensions
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2

-"%COMSPEC%" /c exit 1
+goto fail

 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@ -65,18 +65,29 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2

-"%COMSPEC%" /c exit 1
+goto fail

 :execute
@rem Setup the command line



-@rem Execute gradlew
-@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
-@rem which allows us to clear the local environment before executing the java command
-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*

-:exitWithErrorLevel
-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
-"%COMSPEC%" /c exit %ERRORLEVEL%
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@ -18,9 +18,9 @@ val libsignalClientPath = project.findProperty("libsignal_client_path")?.toStrin

 dependencies {
    if (libsignalClientPath == null) {
-        implementation(libs.signalnetwork)
+        implementation(libs.signalservice)
    } else {
-        implementation(libs.signalnetwork) {
+        implementation(libs.signalservice) {
            exclude(group = "org.signal", module = "libsignal-client")
        }
        implementation(files(libsignalClientPath))
@ -30,7 +30,6 @@ dependencies {
    implementation(libs.slf4j.api)
    implementation(libs.sqlite)
    implementation(libs.hikari)
-    compileOnly(libs.kotlinx.coroutines.core)

    testImplementation(libs.junit.jupiter)
    testImplementation(platform(libs.junit.jupiter.bom))
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@ -54,7 +54,6 @@ import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.api.UsernameLinkUrl;
 import org.asamk.signal.manager.api.UsernameStatus;
 import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
-import org.signal.core.util.UuidUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@ -75,10 +74,6 @@ public interface Manager extends Closeable {
        return PhoneNumberUtil.getInstance().isPossibleNumber(e164Number, countryCode);
    }

-    static boolean isValidAci(final String aci) {
-        return UuidUtil.INSTANCE.isUuid(aci);
-    }
-
    static boolean isSignalClientAvailable() {
        final Logger logger = LoggerFactory.getLogger(Manager.class);
        try {
@ -96,8 +91,6 @@ public interface Manager extends Closeable {

    String getSelfNumber();

-    String getSelfACI();
-
    /**
     * This is used for checking a set of phone numbers for registration on Signal
     *
@ -184,10 +177,6 @@ public interface Manager extends Closeable {

    void deleteGroup(GroupId groupId) throws IOException;

-    SendGroupMessageResults terminateGroup(
-            GroupId groupId
-    ) throws IOException, GroupNotFoundException, NotAGroupMemberException;
-
    Pair<GroupId, SendGroupMessageResults> createGroup(
            String name,
            Set<RecipientIdentifier.Single> members,
@ -224,19 +213,6 @@ public interface Manager extends Closeable {
            long editTargetTimestamp
    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException;

-    /**
-     * Post a file attachment story to "My Story" or to a group.
-     *
-     * @param attachment    path to the file to upload and post as a story
-     * @param allowsReplies whether other users are allowed to reply to this story
-     * @param groupId       if present, post the story to this group instead of "My Story"
-     */
-    SendMessageResults sendStory(
-            String attachment,
-            boolean allowsReplies,
-            Optional<GroupId> groupId
-    ) throws IOException, AttachmentInvalidException, GroupNotFoundException, NotAGroupMemberException;
-
    SendMessageResults sendRemoteDeleteMessage(
            long targetSentTimestamp,
            Set<RecipientIdentifier> recipients
@ -283,7 +259,7 @@ public interface Manager extends Closeable {
            RecipientIdentifier.Single recipient
    ) throws IOException;

-    void sendEndSessionMessage(Set<RecipientIdentifier.Single> recipients) throws IOException;
+    SendMessageResults sendEndSessionMessage(Set<RecipientIdentifier.Single> recipients) throws IOException;

    SendMessageResults sendMessageRequestResponse(
            MessageEnvelope.Sync.MessageRequestResponse.Type type,
--- a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
+++ b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
@ -15,7 +15,6 @@ import org.asamk.signal.manager.internal.RegistrationManagerImpl;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
 import org.asamk.signal.manager.util.KeyUtils;
-import org.signal.core.models.ServiceId.ACI;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
@ -68,7 +67,7 @@ public class SignalAccountFiles {
    public MultiAccountManager initMultiAccountManager() throws IOException {
        final var managerPairs = accountsStore.getAllAccounts().parallelStream().map(a -> {
            try {
-                return new Pair<Manager, Throwable>(initManagerByNumber(a.number(), a.path()), null);
+                return new Pair<Manager, Throwable>(initManager(a.number(), a.path()), null);
            } catch (NotRegisteredException e) {
                logger.warn("Ignoring {}: {} ({})", a.number(), e.getMessage(), e.getClass().getSimpleName());
                return null;
@ -91,31 +90,15 @@ public class SignalAccountFiles {
        return new MultiAccountManagerImpl(managers, this);
    }

-    public Manager initManagerByNumber(String number) throws IOException, NotRegisteredException, AccountCheckException {
+    public Manager initManager(String number) throws IOException, NotRegisteredException, AccountCheckException {
        final var accountPath = accountsStore.getPathByNumber(number);
-        return this.initManagerByNumber(number, accountPath);
+        return this.initManager(number, accountPath);
    }

-    public Manager initManagerByAci(String aciStr) throws IOException, NotRegisteredException, AccountCheckException {
-        final var aci = ACI.parseOrThrow(aciStr);
-        final var accountPath = accountsStore.getPathByAci(aci);
-        return this.initManagerByAci(aci, accountPath);
-    }
-
-    private Manager initManagerByNumber(
+    private Manager initManager(
            String number,
            String accountPath
    ) throws IOException, NotRegisteredException, AccountCheckException {
-        final var account = loadAccount(accountPath);
-        if (!number.equals(account.getNumber())) {
-            account.close();
-            throw new IOException("Number in account file doesn't match expected number: " + account.getNumber());
-        }
-
-        return initManagerFromAccount(number, accountPath, account);
-    }
-
-    private SignalAccount loadAccount(final String accountPath) throws NotRegisteredException, IOException {
        if (accountPath == null) {
            throw new NotRegisteredException();
        }
@ -123,27 +106,12 @@ public class SignalAccountFiles {
            throw new NotRegisteredException();
        }

-        return SignalAccount.load(pathConfig.dataPath(), accountPath, true, settings);
-    }
-
-    private Manager initManagerByAci(
-            ACI aci,
-            String accountPath
-    ) throws IOException, NotRegisteredException, AccountCheckException {
-        final var account = loadAccount(accountPath);
-        if (!aci.equals(account.getAci())) {
+        var account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, settings);
+        if (!number.equals(account.getNumber())) {
            account.close();
-            throw new IOException("ACI in account file doesn't match expected ACI: " + account.getAci());
+            throw new IOException("Number in account file doesn't match expected number: " + account.getNumber());
        }

-        return initManagerFromAccount(aci.toString(), accountPath, account);
-    }
-
-    private ManagerImpl initManagerFromAccount(
-            final String identifier,
-            final String accountPath,
-            final SignalAccount account
-    ) throws NotRegisteredException, IOException, AccountCheckException {
        if (!account.isRegistered()) {
            account.close();
            throw new NotRegisteredException();
@ -168,7 +136,7 @@ public class SignalAccountFiles {
            throw new IOException("signal-cli version is too old for the Signal-Server, please update.");
        } catch (IOException e) {
            manager.close();
-            throw new AccountCheckException("Error while checking account " + identifier + ": " + e.getMessage(), e);
+            throw new AccountCheckException("Error while checking account " + number + ": " + e.getMessage(), e);
        }

        if (account.getServiceEnvironment() == null) {
--- a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
@ -15,7 +15,6 @@ public record Contact(
        long muteUntil,
        boolean hideStory,
        boolean isBlocked,
-        long blockedAt,
        boolean isArchived,
        boolean isProfileSharingEnabled,
        boolean isHidden,
@ -35,7 +34,6 @@ public record Contact(
                builder.muteUntil,
                builder.hideStory,
                builder.isBlocked,
-                builder.blockedAt,
                builder.isArchived,
                builder.isProfileSharingEnabled,
                builder.isHidden,
@ -60,7 +58,6 @@ public record Contact(
        builder.muteUntil = copy.muteUntil();
        builder.hideStory = copy.hideStory();
        builder.isBlocked = copy.isBlocked();
-        builder.blockedAt = copy.blockedAt();
        builder.isArchived = copy.isArchived();
        builder.isProfileSharingEnabled = copy.isProfileSharingEnabled();
        builder.isHidden = copy.isHidden();
@ -83,21 +80,6 @@ public record Contact(
        return givenName + " " + familyName;
    }

-    public String getDisplayNickname() {
-        final var noNickGivenName = Util.isEmpty(nickNameGivenName);
-        final var noNickFamilyName = Util.isEmpty(nickNameFamilyName);
-
-        if (noNickGivenName && noNickFamilyName) {
-            return null;
-        } else if (noNickGivenName) {
-            return nickNameFamilyName;
-        } else if (noNickFamilyName) {
-            return nickNameGivenName;
-        }
-
-        return nickNameGivenName + " " + nickNameFamilyName;
-    }
-
    public static final class Builder {

        private String givenName;
@ -112,7 +94,6 @@ public record Contact(
        private long muteUntil;
        private boolean hideStory;
        private boolean isBlocked;
-        private long blockedAt;
        private boolean isArchived;
        private boolean isProfileSharingEnabled;
        private boolean isHidden;
@ -181,20 +162,10 @@ public record Contact(
        }

        public Builder withIsBlocked(final boolean val) {
-            if (val && !isBlocked) {
-                blockedAt = System.currentTimeMillis();
-            } else if (!val) {
-                blockedAt = 0;
-            }
            isBlocked = val;
            return this;
        }

-        public Builder withBlockedAt(final long val) {
-            blockedAt = val;
-            return this;
-        }
-
        public Builder withIsArchived(final boolean val) {
            isArchived = val;
            return this;
--- a/lib/src/main/java/org/asamk/signal/manager/api/Group.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Group.java
@ -22,8 +22,7 @@ public record Group(
        GroupPermission permissionEditDetails,
        GroupPermission permissionSendMessage,
        boolean isMember,
-        boolean isAdmin,
-        boolean isTerminated
+        boolean isAdmin
 ) {

    public static Group from(
@ -60,7 +59,6 @@ public record Group(
                groupInfo.getPermissionEditDetails(),
                groupInfo.getPermissionSendMessage(),
                groupInfo.isMember(selfRecipientId),
-                groupInfo.isAdmin(selfRecipientId),
-                groupInfo.isTerminated());
+                groupInfo.isAdmin(selfRecipientId));
    }
 }
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@ -4,6 +4,7 @@ import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.helper.RecipientAddressResolver;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.asamk.signal.manager.util.MimeUtils;
+import org.signal.core.models.ServiceId;
 import org.signal.libsignal.metadata.ProtocolException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
@ -156,7 +157,7 @@ public record MessageEnvelope(
                    dataMessage.getExpiresInSeconds(),
                    dataMessage.isExpirationUpdate(),
                    dataMessage.isViewOnce(),
-                    false,
+                    dataMessage.isEndSession(),
                    dataMessage.isProfileKeyUpdate(),
                    dataMessage.getProfileKey().isPresent(),
                    dataMessage.getReaction().map(r -> Reaction.from(r, recipientResolver, addressResolver)),
@ -739,10 +740,7 @@ public record MessageEnvelope(
                                null,
                                d.getE164(),
                                null))
-                        .toList(),
-                        blockedListMessage.groups.stream()
-                                .map(group -> GroupId.unknownVersion(group.getGroupId()))
-                                .toList());
+                        .toList(), blockedListMessage.groupIds.stream().map(GroupId::unknownVersion).toList());
            }
        }

@ -1030,7 +1028,7 @@ public record MessageEnvelope(
            final AttachmentFileProvider fileProvider,
            Exception exception
    ) {
-        final var serviceId = envelope.getSourceServiceId();
+        final var serviceId = envelope.getSourceServiceId().map(ServiceId::parseOrNull).orElse(null);
        final var source = !envelope.isUnidentifiedSender() && serviceId != null
                ? recipientResolver.resolveRecipient(serviceId)
                : envelope.isUnidentifiedSender() && content != null
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@ -3,15 +3,15 @@ package org.asamk.signal.manager.config;
 import org.signal.libsignal.net.Network.Environment;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
-import org.signal.network.config.HttpProxy;
-import org.signal.network.config.SignalCdnUrl;
-import org.signal.network.config.SignalCdsiUrl;
-import org.signal.network.config.SignalProxy;
-import org.signal.network.config.SignalServiceConfiguration;
-import org.signal.network.config.SignalServiceUrl;
-import org.signal.network.config.SignalStorageUrl;
-import org.signal.network.config.SignalSvr2Url;
-import org.signal.network.config.TrustStore;
+import org.whispersystems.signalservice.api.push.TrustStore;
+import org.whispersystems.signalservice.internal.configuration.HttpProxy;
+import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalProxy;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url;

 import java.util.Base64;
 import java.util.List;
@ -30,8 +30,7 @@ class LiveConfig {
    private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT2 = Base64.getDecoder()
            .decode("BUkY0I+9+oPgDCn4+Ac6Iu813yvqkDr/ga8DzLxFxuk6");
    private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private static final String SVR2_MRENCLAVE = "ced8217b26228e4b210c985786999d095c4958a94faf37b14acaf25c4cbb02a4";
-    private static final String SVR2_MRENCLAVE_LEGACY = "1240acbd4aa26974184844c8a46b1022d3957ac8a76c1fd8f5b1a15141ee0708";
+    private static final String SVR2_MRENCLAVE = "29cd63c87bea751e3bfd0fbd401279192e2e5c99948b4ee9437eafc4968355fb";

    private static final String URL = "https://chat.signal.org";
    private static final String CDN_URL = "https://cdn.signal.org";
@ -94,7 +93,7 @@ class LiveConfig {
                createDefaultServiceConfiguration(interceptors),
                getUnidentifiedSenderTrustRoots(),
                CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY));
+                List.of(SVR2_MRENCLAVE));
    }

    private LiveConfig() {
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@ -31,14 +31,7 @@ public class ServiceConfig {
    public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
        final var attachmentBackfill = !isPrimaryDevice;
        final var spqr = true;
-        final var usernameSyncChangeMessage = !isPrimaryDevice;
-        final var optionalPhoneNumber = !isPrimaryDevice;
-        return new AccountAttributes.Capabilities(true,
-                true,
-                attachmentBackfill,
-                spqr,
-                usernameSyncChangeMessage,
-                optionalPhoneNumber);
+        return new AccountAttributes.Capabilities(true, true, attachmentBackfill, spqr);
    }

    public static ServiceEnvironmentConfig getServiceEnvironmentConfig(
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
@ -3,7 +3,7 @@ package org.asamk.signal.manager.config;
 import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.signal.libsignal.net.Network;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
-import org.signal.network.config.SignalServiceConfiguration;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;

 import java.util.List;

--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@ -3,15 +3,15 @@ package org.asamk.signal.manager.config;
 import org.signal.libsignal.net.Network;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
-import org.signal.network.config.HttpProxy;
-import org.signal.network.config.SignalCdnUrl;
-import org.signal.network.config.SignalCdsiUrl;
-import org.signal.network.config.SignalProxy;
-import org.signal.network.config.SignalServiceConfiguration;
-import org.signal.network.config.SignalServiceUrl;
-import org.signal.network.config.SignalStorageUrl;
-import org.signal.network.config.SignalSvr2Url;
-import org.signal.network.config.TrustStore;
+import org.whispersystems.signalservice.api.push.TrustStore;
+import org.whispersystems.signalservice.internal.configuration.HttpProxy;
+import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalProxy;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url;

 import java.util.Base64;
 import java.util.List;
@ -30,8 +30,7 @@ class StagingConfig {
    private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT2 = Base64.getDecoder()
            .decode("BYhU6tPjqP46KGZEzRs1OL4U39V5dlPJ/X09ha4rErkm");
    private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private static final String SVR2_MRENCLAVE = "3c699f4975aaa3d172c0aad042f94f031b2b03e10b9c19a45116a01693d83302";
-    private static final String SVR2_MRENCLAVE_LEGACY = "97f151f6ed078edbbfd72fa9cae694dcc08353f1f5e8d9ccd79a971b10ffc535";
+    private static final String SVR2_MRENCLAVE = "a75542d82da9f6914a1e31f8a7407053b99cc99a0e7291d8fbd394253e19b036";

    private static final String URL = "https://chat.staging.signal.org";
    private static final String CDN_URL = "https://cdn-staging.signal.org";
@ -94,7 +93,7 @@ class StagingConfig {
                createDefaultServiceConfiguration(interceptors),
                getUnidentifiedSenderTrustRoots(),
                CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY));
+                List.of(SVR2_MRENCLAVE));
    }

    private StagingConfig() {
--- a/lib/src/main/java/org/asamk/signal/manager/config/WhisperTrustStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/WhisperTrustStore.java
@ -1,6 +1,6 @@
 package org.asamk.signal.manager.config;

-import org.signal.network.config.TrustStore;
+import org.whispersystems.signalservice.api.push.TrustStore;

 import java.io.InputStream;

--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@ -17,23 +17,19 @@ import org.asamk.signal.manager.util.Utils;
 import org.signal.core.models.ServiceId.ACI;
 import org.signal.core.models.ServiceId.PNI;
 import org.signal.core.util.Base64;
-import org.signal.core.util.crypto.DeviceNameCipher;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.protocol.NoSessionException;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.signal.libsignal.protocol.util.KeyHelper;
 import org.signal.libsignal.usernames.BaseUsernameException;
 import org.signal.libsignal.usernames.Username;
-import org.signal.network.exceptions.NonSuccessfulResponseCodeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.link.LinkedDeviceVerificationCodeResponse;
-import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.SignedPreKeyEntity;
@ -41,6 +37,8 @@ import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.internal.push.DeviceLimitExceededException;
 import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity;
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage;
@ -48,9 +46,7 @@ import org.whispersystems.signalservice.internal.push.SyncMessage;
 import org.whispersystems.signalservice.internal.push.exceptions.MismatchedDevicesException;

 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
@ -61,7 +57,6 @@ import okio.ByteString;

 import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_MAXIMUM_ID;
 import static org.asamk.signal.manager.util.Utils.handleResponseException;
-import static org.asamk.signal.manager.util.Utils.handleResponseExceptionSuspend;
 import static org.whispersystems.signalservice.internal.util.Util.isEmpty;

 public class AccountHelper {
@ -285,7 +280,7 @@ public class AccountHelper {
                    final var message = messageSender.getEncryptedSyncPniInitializeDeviceMessage(deviceId,
                            pniChangeNumber);
                    encryptedDeviceMessages.add(message);
-                } catch (UntrustedIdentityException | IOException | InvalidKeyException | NoSessionException e) {
+                } catch (UntrustedIdentityException | IOException | InvalidKeyException e) {
                    throw new RuntimeException(e);
                }
            }
@ -325,14 +320,10 @@ public class AccountHelper {
            return;
        }

-        handlePniChangeNumberMessage(selfChangeNumber, updatePni, false);
+        handlePniChangeNumberMessage(selfChangeNumber, updatePni);
    }

-    public boolean handlePniChangeNumberMessage(
-            final SyncMessage.PniChangeNumber pniChangeNumber,
-            final PNI updatedPni,
-            final boolean forcePniPreKeyRotation
-    ) {
+    public void handlePniChangeNumberMessage(final SyncMessage.PniChangeNumber pniChangeNumber, final PNI updatedPni) {
        if (pniChangeNumber.identityKeyPair != null
                && pniChangeNumber.registrationId != null
                && pniChangeNumber.signedPreKey != null) {
@ -346,19 +337,10 @@ public class AccountHelper {
                        pniChangeNumber.lastResortKyberPreKey != null
                                ? new KyberPreKeyRecord(pniChangeNumber.lastResortKyberPreKey.toByteArray())
                                : null);
-                if (forcePniPreKeyRotation) {
-                    try {
-                        context.getPreKeyHelper().forceRefreshPreKeys(ServiceIdType.PNI);
-                    } catch (IOException e) {
-                        logger.warn("Failed to force refresh PNI pre keys after PNI change sync", e);
-                    }
-                }
-                return true;
            } catch (Exception e) {
                logger.warn("Failed to handle change number message", e);
            }
        }
-        return false;
    }

    public static final int USERNAME_MIN_LENGTH = 3;
@ -400,17 +382,13 @@ public class AccountHelper {
    }

    private void reserveUsername(final List<Username> candidates) throws IOException {
-        final var candidateHashes = new ArrayList<byte[]>();
+        final var candidateHashes = new ArrayList<String>();
        for (final var candidate : candidates) {
-            candidateHashes.add(candidate.getHash());
+            candidateHashes.add(Base64.encodeUrlSafeWithoutPadding(candidate.getHash()));
        }

-        final var usernameHash = handleResponseException(dependencies.getAccountApi().reserveUsername(candidateHashes));
-        final var hashIndex = candidateHashes.stream()
-                .filter(candidateHash -> Arrays.equals(candidateHash, usernameHash))
-                .findFirst()
-                .map(candidateHashes::indexOf)
-                .orElse(-1);
+        final var response = handleResponseException(dependencies.getAccountApi().reserveUsername(candidateHashes));
+        final var hashIndex = candidateHashes.indexOf(response.getUsernameHash());
        if (hashIndex == -1) {
            logger.warn("[reserveUsername] The response hash could not be found in our set of candidateHashes.");
            throw new IOException("Unexpected username response");
@ -503,7 +481,8 @@ public class AccountHelper {
        final var usernameLink = account.getUsernameLink();

        if (usernameLink == null) {
-            handleResponseException(dependencies.getAccountApi().reserveUsername(List.of(username.getHash())));
+            handleResponseException(dependencies.getAccountApi()
+                    .reserveUsername(List.of(Base64.encodeUrlSafeWithoutPadding(username.getHash()))));
            logger.debug("[reserveUsername] Successfully reserved existing username.");
            final var linkComponents = confirmUsernameAndCreateNewLink(username);
            account.setUsernameLink(linkComponents);
@ -528,34 +507,28 @@ public class AccountHelper {
        }
    }

-    @SuppressWarnings("unchecked")
    public void deleteUsername() throws IOException {
-        handleResponseException(dependencies.getAccountApi().deleteUsernameHash());
+        handleResponseException(dependencies.getAccountApi().deleteUsername());
        account.setUsernameLink(null);
        account.setUsername(null);
        logger.debug("[deleteUsername] Successfully deleted the username.");
    }

    public void setDeviceName(String deviceName) {
-        final var encryptedDeviceName = getEncryptedDeviceName(deviceName);
-        account.setEncryptedDeviceName(Base64.encodeWithoutPadding(encryptedDeviceName));
+        final var privateKey = account.getAciIdentityKeyPair().getPrivateKey();
+        final var encryptedDeviceName = DeviceNameUtil.encryptDeviceName(deviceName, privateKey);
+        account.setEncryptedDeviceName(encryptedDeviceName);
    }

    public void setDeviceName(int deviceId, String deviceName) throws IOException {
-        final var encryptedDeviceName = getEncryptedDeviceName(deviceName);
-        handleResponseExceptionSuspend(cont -> dependencies.getLinkDeviceApi()
-                .setDeviceName(encryptedDeviceName, deviceId, cont));
+        final var privateKey = account.getAciIdentityKeyPair().getPrivateKey();
+        final var encryptedDeviceName = DeviceNameUtil.encryptDeviceName(deviceName, privateKey);
+        handleResponseException(dependencies.getLinkDeviceApi().setDeviceName(encryptedDeviceName, deviceId));
        context.getSyncHelper().sendDeviceNameChange(deviceId);
    }

-    private byte[] getEncryptedDeviceName(final String deviceName) {
-        final var identityKey = account.getAciIdentityKeyPair();
-        return DeviceNameCipher.encryptDeviceName(deviceName.getBytes(StandardCharsets.UTF_8), identityKey);
-    }
-
    public void refreshDeviceName() throws IOException {
-        final List<DeviceInfo> devices = handleResponseExceptionSuspend(cont -> dependencies.getLinkDeviceApi()
-                .getDevices(cont));
+        final var devices = handleResponseException(dependencies.getLinkDeviceApi().getDevices());
        final var deviceId = account.getDeviceId();
        final var device = devices.stream().filter(d -> d.id == deviceId).findFirst();
        if (device.isPresent()) {
@ -589,16 +562,14 @@ public class AccountHelper {
                        account.getOrCreatePinMasterKey(),
                        account.getOrCreateMediaRootBackupKey(),
                        verificationCode.getVerificationCode(),
-                        null,
-                        account.getAuthCredentialSalt()));
+                        null));
        account.setMultiDevice(true);
        context.getJobExecutor().enqueueJob(new SyncStorageJob());
    }

    public void removeLinkedDevices(int deviceId) throws IOException {
-        handleResponseExceptionSuspend(cont -> dependencies.getLinkDeviceApi().removeDevice(deviceId, cont));
-        final List<DeviceInfo> devices = handleResponseExceptionSuspend(cont -> dependencies.getLinkDeviceApi()
-                .getDevices(cont));
+        handleResponseException(dependencies.getLinkDeviceApi().removeDevice(deviceId));
+        var devices = handleResponseException(dependencies.getLinkDeviceApi().getDevices());
        account.setMultiDevice(devices.size() > 1);
    }

@ -606,14 +577,16 @@ public class AccountHelper {
        var masterKey = account.getOrCreatePinMasterKey();

        context.getPinHelper().migrateRegistrationLockPin(account.getRegistrationLockPin(), masterKey);
-        handleResponseException(dependencies.getAccountApi().enableRegistrationLock(masterKey));
+        handleResponseException(dependencies.getAccountApi()
+                .enableRegistrationLock(masterKey.deriveRegistrationLock()));
    }

    public void setRegistrationPin(String pin) throws IOException {
        var masterKey = account.getOrCreatePinMasterKey();

        context.getPinHelper().setRegistrationLockPin(pin, masterKey);
-        handleResponseException(dependencies.getAccountApi().enableRegistrationLock(masterKey));
+        handleResponseException(dependencies.getAccountApi()
+                .enableRegistrationLock(masterKey.deriveRegistrationLock()));

        account.setRegistrationLockPin(pin);
        updateAccountAttributes();
@ -631,7 +604,7 @@ public class AccountHelper {
        // When setting an empty GCM id, the Signal-Server also sets the fetchesMessages property to false.
        // If this is the primary device, other users can't send messages to this number anymore.
        // If this is a linked device, other users can still send messages, but this device doesn't receive them anymore.
-        handleResponseExceptionSuspend(cont -> dependencies.getAccountApi().clearFcmToken(cont));
+        handleResponseException(dependencies.getAccountApi().clearFcmToken());

        account.setRegistered(false);
        unregisteredListener.call();
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@ -34,10 +34,8 @@ public class AttachmentHelper {

    private final SignalDependencies dependencies;
    private final AttachmentStore attachmentStore;
-    private final Context context;

    public AttachmentHelper(final Context context) {
-        this.context = context;
        this.dependencies = context.getDependencies();
        this.attachmentStore = context.getAttachmentStore();
    }
@ -94,21 +92,6 @@ public class AttachmentHelper {
            final boolean voiceNote
    ) throws AttachmentInvalidException {
        try {
-            // Reject local files that point into the signal-cli data directory
-            if (attachment != null && !attachment.startsWith("data:")) {
-                try {
-                    final var file = new File(attachment);
-                    final var canonical = file.getCanonicalFile();
-                    final var dataPath = context.getAccount().getDataPath().getCanonicalFile();
-                    if (canonical.toPath().startsWith(dataPath.toPath())) {
-                        throw new AttachmentInvalidException(attachment,
-                                new IOException("Attaching files from the signal-cli data directory is not allowed"));
-                    }
-                } catch (IOException e) {
-                    throw new AttachmentInvalidException(attachment, e);
-                }
-            }
-
            final var streamDetailsAndFileName = Utils.createStreamDetails(attachment);
            final var streamDetails = streamDetailsAndFileName.first();
            final var uploadSpec = getResumableUploadSpec(streamDetails);
@ -126,7 +109,7 @@ public class AttachmentHelper {
        final var streamLength = streamDetails.getLength();
        final var ciphertextLength = AttachmentCipherStreamUtil.getCiphertextLength(PaddingInputStream.getPaddedSize(
                streamLength));
-        return dependencies.getCdnService().getResumableUploadSpecBlocking(ciphertextLength);
+        return dependencies.getMessageSender().getResumableUploadSpec(ciphertextLength);
    }

    public SignalServiceAttachmentPointer uploadAttachment(String attachment) throws IOException, AttachmentInvalidException {
--- a/lib/src/main/java/org/asamk/signal/manager/helper/CallManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/CallManager.java
@ -649,7 +649,7 @@ public class CallManager implements AutoCloseable {
            case "busy", "busyonanotherdevice" -> HangupMessage.Type.BUSY;
            default -> HangupMessage.Type.NORMAL;
        };
-        var hangupMessage = new HangupMessage(state.callId, type, 0);
+        var hangupMessage = new HangupMessage(state.callId, type, state.deviceId);
        var callMessage = SignalServiceCallMessage.forHangup(hangupMessage, state.deviceId);
        final var result = context.getSendHelper().sendCallMessage(callMessage, state.recipientId);
        logger.debug("Sent hangup ({}) via Signal for call {}", hangupType, callIdUnsigned(state.callId));
@ -711,7 +711,7 @@ public class CallManager implements AutoCloseable {
                && !"rejected".equals(reason)
                && !"remote_busy".equals(reason)
                && !"ringrtc_hangup".equals(reason)) {
-            var hangupMessage = new HangupMessage(callId, HangupMessage.Type.NORMAL, 0);
+            var hangupMessage = new HangupMessage(callId, HangupMessage.Type.NORMAL, state.deviceId);
            var callMessage = SignalServiceCallMessage.forHangup(hangupMessage, null);
            final var result = context.getSendHelper().sendCallMessage(callMessage, state.recipientId);
            if (!result.isSuccess()) {
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
@ -85,18 +85,12 @@ public class ContactHelper {
    }

    public void setContactBlocked(RecipientId recipientId, boolean blocked) {
-        setContactBlocked(recipientId, blocked, blocked ? System.currentTimeMillis() : 0);
-    }
-
-    public void setContactBlocked(RecipientId recipientId, boolean blocked, long blockedAt) {
        var contact = account.getContactStore().getContact(recipientId);
        final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
        if (blocked) {
            builder.withIsProfileSharingEnabled(false);
        }
-        account.getContactStore()
-                .storeContact(recipientId,
-                        builder.withIsBlocked(blocked).withBlockedAt(blocked ? blockedAt : 0).build());
+        account.getContactStore().storeContact(recipientId, builder.withIsBlocked(blocked).build());
    }

    public void setContactProfileSharing(RecipientId recipientId, boolean profileSharing) {
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@ -363,28 +363,6 @@ public class GroupHelper {
        return results;
    }

-    public SendGroupMessageResults terminateGroup(final GroupId groupId) throws IOException, GroupNotFoundException, NotAGroupMemberException {
-        final var group = getGroupForUpdating(groupId);
-        if (!(group instanceof GroupInfoV2)) {
-            throw new IOException("Terminating a group is only supported for Signal group v2 groups.");
-        }
-
-        SendGroupMessageResults results;
-        try {
-            results = terminateGroupV2((GroupInfoV2) group);
-        } catch (ConflictException e) {
-            // Detected conflicting update, refreshing group and trying again
-            results = terminateGroupV2((GroupInfoV2) getGroup(groupId, true));
-        }
-        context.getJobExecutor().enqueueJob(new SyncStorageJob());
-        return results;
-    }
-
-    private SendGroupMessageResults terminateGroupV2(final GroupInfoV2 group) throws IOException {
-        final var groupGroupChangePair = context.getGroupV2Helper().terminateGroup(group);
-        return sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
-    }
-
    public void updateGroupProfileKey(GroupIdV2 groupId) throws GroupNotFoundException, NotAGroupMemberException, IOException {
        var group = getGroupForUpdating(groupId);

@ -459,21 +437,12 @@ public class GroupHelper {
    }

    public void setGroupBlocked(final GroupId groupId, final boolean blocked) throws GroupNotFoundException {
-        setGroupBlocked(groupId, blocked, blocked ? System.currentTimeMillis() : 0);
-    }
-
-    public void setGroupBlocked(
-            final GroupId groupId,
-            final boolean blocked,
-            final long blockedAt
-    ) throws GroupNotFoundException {
        var group = getGroup(groupId);
        if (group == null) {
            throw new GroupNotFoundException(groupId);
        }

        group.setBlocked(blocked);
-        group.setBlockedAt(blocked ? blockedAt : 0);
        account.getGroupStore().updateGroup(group);
        context.getJobExecutor().enqueueJob(new SyncStorageJob());
    }
@ -589,24 +558,16 @@ public class GroupHelper {
    private void storeProfileKeysFromMembers(final DecryptedGroup group) {
        for (var member : group.members) {
            final var serviceId = ServiceId.parseOrThrow(member.aciBytes);
-            storeProfileKeyIfMissing(serviceId, member.profileKey.toByteArray());
-        }
-        for (var member : group.requestingMembers) {
-            final var serviceId = ServiceId.parseOrThrow(member.aciBytes);
-            storeProfileKeyIfMissing(serviceId, member.profileKey.toByteArray());
-        }
-    }
-
-    private void storeProfileKeyIfMissing(final ServiceId serviceId, final byte[] profileKeyBytes) {
-        final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
-        final var profileStore = account.getProfileStore();
-        if (profileStore.getProfileKey(recipientId) != null) {
-            // We already have a profile key, not updating it from a non-authoritative source
-            return;
-        }
-        try {
-            profileStore.storeProfileKey(recipientId, new ProfileKey(profileKeyBytes));
-        } catch (InvalidInputException ignored) {
+            final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
+            final var profileStore = account.getProfileStore();
+            if (profileStore.getProfileKey(recipientId) != null) {
+                // We already have a profile key, not updating it from a non-authoritative source
+                continue;
+            }
+            try {
+                profileStore.storeProfileKey(recipientId, new ProfileKey(member.profileKey.toByteArray()));
+            } catch (InvalidInputException ignored) {
+            }
        }
    }

--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@ -21,7 +21,6 @@ import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
 import org.signal.libsignal.zkgroup.groups.UuidCiphertext;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.network.exceptions.NonSuccessfulResponseCodeException;
 import org.signal.storageservice.storage.protos.groups.AccessControl;
 import org.signal.storageservice.storage.protos.groups.GroupChange;
 import org.signal.storageservice.storage.protos.groups.GroupChangeResponse;
@ -44,6 +43,7 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.groupsv2.InvalidGroupStateException;
 import org.whispersystems.signalservice.api.groupsv2.NotAbleToApplyGroupV2ChangeException;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 import org.whispersystems.signalservice.internal.push.exceptions.NotInGroupException;

 import java.io.IOException;
@ -264,9 +264,6 @@ class GroupV2Helper {
        var pendingMembersList = groupInfoV2.getGroup().pendingMembers;
        final var selfAci = getSelfAci();
        var selfPendingMember = DecryptedGroupUtil.findPendingByServiceId(pendingMembersList, selfAci);
-        if (selfPendingMember.isEmpty()) {
-            selfPendingMember = DecryptedGroupUtil.findPendingByServiceId(pendingMembersList, getSelfPni());
-        }

        if (selfPendingMember.isPresent()) {
            return revokeInvites(groupInfoV2, Set.of(selfPendingMember.get()));
@ -543,14 +540,6 @@ class GroupV2Helper {
        return commitChange(groupInfoV2, change);
    }

-    Pair<DecryptedGroup, GroupChangeResponse> terminateGroup(
-            GroupInfoV2 groupInfoV2
-    ) throws IOException {
-        final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
-        final var change = groupOperations.createTerminateGroup();
-        return commitChange(groupInfoV2, change);
-    }
-
    Pair<DecryptedGroup, GroupChangeResponse> setMemberLabels(
            GroupInfoV2 groupInfoV2,
            String labelEmoji,
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@ -109,8 +109,8 @@ public final class IncomingMessageHandler {
        SignalServiceContent content = null;
        if (!envelope.isReceipt()) {
            account.getIdentityKeyStore().setRetryingDecryption(true);
+            final var destination = getDestination(envelope).serviceId();
            try {
-                final var destination = getDestination(envelope).serviceId();
                final var cipherResult = dependencies.getCipher(destination == null
                                || destination.equals(account.getAci()) ? ServiceIdType.ACI : ServiceIdType.PNI)
                        .decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp());
@ -140,30 +140,15 @@ public final class IncomingMessageHandler {
            final Manager.ReceiveMessageHandler handler
    ) {
        final var actions = new ArrayList<HandleAction>();
-        if (envelope.isPreKeySignalMessage()) {
-            actions.add(RefreshPreKeysAction.create());
-        }
        SignalServiceContent content = null;
        Exception exception = null;
-        if (envelope.getSourceServiceId() != null) {
-            // Store uuid if we don't have it already
-            // uuid in envelope is sent by server
-            account.getRecipientResolver().resolveRecipient(envelope.getSourceServiceId());
-        }
+        envelope.getSourceServiceId().map(ServiceId::parseOrNull)
+                // Store uuid if we don't have it already
+                // uuid in envelope is sent by server
+                .ifPresent(serviceId -> account.getRecipientResolver().resolveRecipient(serviceId));
        if (!envelope.isReceipt()) {
+            final var destination = getDestination(envelope).serviceId();
            try {
-                final var destination = getDestination(envelope).serviceId();
-
-                if (destination == account.getPni() && envelope.getSourceServiceId() == null) {
-                    throw new InvalidMessageException(
-                            "Got a sealed sender message to our PNI? Invalid message, ignoring.");
-                }
-
-                if (envelope.getSourceServiceId() instanceof ServiceId.PNI
-                        && envelope.getProto().type != Envelope.Type.SERVER_DELIVERY_RECEIPT) {
-                    throw new InvalidMessageException("Got a message from a PNI that was not a SERVER_DELIVERY_RECEIPT.");
-                }
-
                final var cipherResult = dependencies.getCipher(destination == null
                                || destination.equals(account.getAci()) ? ServiceIdType.ACI : ServiceIdType.PNI)
                        .decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp());
@ -188,13 +173,7 @@ public final class IncomingMessageHandler {
                    logger.debug("Received invalid message from blocked contact, ignoring.");
                } else {
                    var serviceId = ServiceId.parseOrNull(e.getSender());
-                    ServiceId destination;
-                    try {
-                        destination = getDestination(envelope).serviceId();
-                    } catch (InvalidMessageException ex) {
-                        destination = null;
-                    }
-                    if (serviceId != null && destination != null) {
+                    if (serviceId != null) {
                        final var isSelf = sender.equals(account.getSelfRecipientId())
                                && e.getSenderDevice() == account.getDeviceId();
                        logger.debug("Received invalid message, queuing renew session action.");
@ -332,17 +311,12 @@ public final class IncomingMessageHandler {
        final var sender = senderDeviceAddress.recipientId();
        final var senderServiceId = senderDeviceAddress.serviceId();
        final var senderDeviceId = senderDeviceAddress.deviceId();
-        final DeviceAddress destination;
-        try {
-            destination = getDestination(envelope);
-        } catch (InvalidMessageException e) {
-            throw new AssertionError(e);
-        }
+        final var destination = getDestination(envelope);

        if (account.getPni().equals(destination.serviceId)) {
-            account.getRecipientStore().markNeedsPniSignature(sender, true);
+            account.getRecipientStore().markNeedsPniSignature(destination.recipientId, true);
        } else if (account.getAci().equals(destination.serviceId)) {
-            account.getRecipientStore().markNeedsPniSignature(sender, false);
+            account.getRecipientStore().markNeedsPniSignature(destination.recipientId, false);
        }

        if (content.getReceiptMessage().isPresent()) {
@ -498,11 +472,10 @@ public final class IncomingMessageHandler {
        }

        logger.debug("Verified association of ACI {} with PNI {}", aci, pni);
-        final var recipientId = account.getRecipientTrustedResolver()
+        account.getRecipientTrustedResolver()
                .resolveRecipientTrusted(Optional.of(ACI.from(aci.getRawUuid())),
                        Optional.of(pni),
                        senderAddress.getNumber());
-        account.getRecipientStore().markPniSignatureVerified(recipientId);
        return true;
    }

@ -626,12 +599,13 @@ public final class IncomingMessageHandler {
            for (var individual : blockedListMessage.individuals) {
                final var address = new RecipientAddress(individual.getAci(), individual.getE164());
                final var recipientId = account.getRecipientResolver().resolveRecipient(address);
-                context.getContactHelper().setContactBlocked(recipientId, true, individual.getBlockedAt());
+                context.getContactHelper().setContactBlocked(recipientId, true);
            }
-            for (var group : blockedListMessage.groups) {
-                final var groupId = GroupId.unknownVersion(group.getGroupId());
+            for (var groupId : blockedListMessage.groupIds.stream()
+                    .map(GroupId::unknownVersion)
+                    .collect(Collectors.toSet())) {
                try {
-                    context.getGroupHelper().setGroupBlocked(groupId, true, group.getBlockedAt());
+                    context.getGroupHelper().setGroupBlocked(groupId, true);
                } catch (GroupNotFoundException e) {
                    logger.warn("BlockedListMessage contained groupID that was not found in GroupStore: {}",
                            groupId.toBase64());
@ -717,30 +691,11 @@ public final class IncomingMessageHandler {
        }
        if (syncMessage.getPniChangeNumber().isPresent()) {
            final var pniChangeNumber = syncMessage.getPniChangeNumber().get();
-            if (account.isPrimaryDevice()) {
-                logger.warn("Received PNI change number sync message on primary device, ignoring.");
-            } else if (sender.deviceId() != SignalServiceAddress.DEFAULT_DEVICE_ID) {
-                logger.warn("Received PNI change number sync message from non-primary device {}, ignoring.",
-                        sender.deviceId());
-            } else {
-                final var envelopeServerTimestamp = envelope.getServerDeliveredTimestamp();
-                final var lastAppliedServerTimestamp = account.getLastAppliedPniChangeServerTimestamp();
-                if (envelopeServerTimestamp <= lastAppliedServerTimestamp) {
-                    logger.warn(
-                            "PNI change number sync server timestamp ({}) is not newer than last applied ({}), treating as replay.",
-                            envelopeServerTimestamp,
-                            lastAppliedServerTimestamp);
-                } else {
-                    final var updatedPniString = envelope.getUpdatedPni();
-                    if (updatedPniString != null && !updatedPniString.isEmpty()) {
-                        final var updatedPni = ServiceId.PNI.parseOrThrow(updatedPniString);
-                        final var applied = context.getAccountHelper()
-                                .handlePniChangeNumberMessage(pniChangeNumber, updatedPni, true);
-                        if (applied) {
-                            account.setLastAppliedPniChangeServerTimestamp(envelopeServerTimestamp);
-                        }
-                    }
-                }
+            logger.debug("Received PNI change number sync message, applying.");
+            final var updatedPniString = envelope.getUpdatedPni();
+            if (updatedPniString != null && !updatedPniString.isEmpty()) {
+                final var updatedPni = ServiceId.PNI.parseOrThrow(updatedPniString);
+                context.getAccountHelper().handlePniChangeNumberMessage(pniChangeNumber, updatedPni);
            }
        }
        if (syncMessage.getDeviceNameChange().isPresent()) {
@ -836,15 +791,6 @@ public final class IncomingMessageHandler {
            return true;
        }

-        if (group.isTerminated()) {
-            return message == null
-                    || message.getBody().isPresent()
-                    || message.getAttachments().isPresent()
-                    || message.getQuote().isPresent()
-                    || message.getPreviews().isPresent()
-                    || message.getMentions().isPresent()
-                    || message.getSticker().isPresent();
-        }
        if (group.isAnnouncementGroup() && !group.isAdmin(recipientId)) {
            return message == null
                    || message.getBody().isPresent()
@ -928,6 +874,11 @@ public final class IncomingMessageHandler {

        final var selfAddress = isSync ? source : destination;
        final var conversationPartnerAddress = isSync ? destination : source;
+        if (conversationPartnerAddress != null && message.isEndSession()) {
+            account.getAccountData(selfAddress.serviceId())
+                    .getSessionStore()
+                    .deleteAllSessions(conversationPartnerAddress.serviceId());
+        }
        if (message.isExpirationUpdate() || message.getBody().isPresent()) {
            if (message.getGroupContext().isPresent()) {
                final var groupContext = message.getGroupContext().get();
@ -1096,7 +1047,7 @@ public final class IncomingMessageHandler {
    }

    private SignalServiceAddress getSenderAddress(SignalServiceEnvelope envelope, SignalServiceContent content) {
-        final var serviceId = envelope.getSourceServiceId();
+        final var serviceId = envelope.getSourceServiceId().map(ServiceId::parseOrNull).orElse(null);
        if (!envelope.isUnidentifiedSender() && serviceId != null) {
            return new SignalServiceAddress(serviceId);
        } else if (content != null) {
@ -1107,7 +1058,7 @@ public final class IncomingMessageHandler {
    }

    private DeviceAddress getSender(SignalServiceEnvelope envelope, SignalServiceContent content) {
-        final var serviceId = envelope.getSourceServiceId();
+        final var serviceId = envelope.getSourceServiceId().map(ServiceId::parseOrNull).orElse(null);
        if (!envelope.isUnidentifiedSender() && serviceId != null) {
            return new DeviceAddress(account.getRecipientResolver().resolveRecipient(serviceId),
                    serviceId,
@ -1119,13 +1070,10 @@ public final class IncomingMessageHandler {
        }
    }

-    private DeviceAddress getDestination(SignalServiceEnvelope envelope) throws InvalidMessageException {
+    private DeviceAddress getDestination(SignalServiceEnvelope envelope) {
        final var destination = envelope.getDestinationServiceId();
        if (destination == null || destination.isUnknown()) {
-            throw new InvalidMessageException("Missing destination");
-        }
-        if (!account.getAci().equals(destination) && !account.getPni().equals(destination)) {
-            throw new InvalidMessageException("Message not intended for this account");
+            return new DeviceAddress(account.getSelfRecipientId(), account.getAci(), account.getDeviceId());
        }
        return new DeviceAddress(account.getRecipientResolver().resolveRecipient(destination),
                destination,
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@ -9,7 +9,6 @@ import org.signal.libsignal.protocol.InvalidKeyIdException;
 import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
-import org.signal.network.exceptions.NonSuccessfulResponseCodeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.NetworkResultUtil;
@ -17,6 +16,7 @@ import org.whispersystems.signalservice.api.account.PreKeyUpload;
 import org.whispersystems.signalservice.api.keys.OneTimePreKeyCounts;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;

 import java.io.IOException;
 import java.util.List;
@ -84,8 +84,7 @@ public class PreKeyHelper {
    ) throws IOException {
        OneTimePreKeyCounts preKeyCounts;
        try {
-            preKeyCounts = handleResponseException(dependencies.getKeysApi()
-                    .getAvailablePreKeyCountsSync(serviceIdType));
+            preKeyCounts = handleResponseException(dependencies.getKeysApi().getAvailablePreKeyCounts(serviceIdType));
        } catch (AuthorizationFailedException e) {
            logger.debug("Failed to get pre key count, ignoring: " + e.getClass().getSimpleName());
            preKeyCounts = new OneTimePreKeyCounts(0, 0);
@ -146,7 +145,7 @@ public class PreKeyHelper {
                kyberPreKeyRecords);
        var needsReset = false;
        try {
-            NetworkResultUtil.toPreKeysLegacy(dependencies.getKeysApi().setPreKeysSync(preKeyUpload));
+            NetworkResultUtil.toPreKeysLegacy(dependencies.getKeysApi().setPreKeys(preKeyUpload));
            try {
                if (preKeyRecords != null) {
                    account.addPreKeys(serviceIdType, preKeyRecords);
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@ -17,12 +17,10 @@ import org.asamk.signal.manager.util.PaymentUtils;
 import org.asamk.signal.manager.util.ProfileUtils;
 import org.asamk.signal.manager.util.Utils;
 import org.jetbrains.annotations.Nullable;
-import org.signal.core.util.ExpiringProfileCredentialUtil;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.network.exceptions.PushNetworkException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.NetworkResultUtil;
@ -32,7 +30,9 @@ import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
+import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 import org.whispersystems.signalservice.api.services.ProfileService;
+import org.whispersystems.signalservice.api.util.ExpiringProfileCredentialUtil;

 import java.io.IOException;
 import java.io.OutputStream;
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@ -9,10 +9,10 @@ import org.asamk.signal.manager.jobs.CleanOldPreKeysJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.messageCache.CachedMessage;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.signal.core.models.ServiceId;
 import org.signal.core.models.ServiceId.ACI;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.messages.EnvelopeResponse;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
@ -148,19 +148,15 @@ public class ReceiveHelper {
                    logger.debug("Retrieved {} envelopes!", batch.size());
                    isWaitingForMessage = false;
                    for (final var it : batch) {
-                        if (it instanceof EnvelopeResponse.Unparseable) {
-                            logger.warn("Received unparseable envelope from server, ignoring.");
-                        } else if (it instanceof EnvelopeResponse.Parsed parsed) {
-                            SignalServiceEnvelope envelope1 = new SignalServiceEnvelope(parsed.getEnvelope(),
-                                    parsed.getServerDeliveredTimestamp());
-                            final var sourceServiceId = envelope1.getSourceServiceId();
-                            final var recipientId = sourceServiceId == null
-                                    ? null
-                                    : account.getRecipientResolver().resolveRecipient(sourceServiceId);
-                            logger.trace("Storing new message from {}", recipientId);
-                            // store message on disk, before acknowledging receipt to the server
-                            cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
-                        }
+                        SignalServiceEnvelope envelope1 = new SignalServiceEnvelope(it.getEnvelope(),
+                                it.getServerDeliveredTimestamp());
+                        final var recipientId = envelope1.getSourceServiceId()
+                                .map(ServiceId::parseOrNull)
+                                .map(s -> account.getRecipientResolver().resolveRecipient(s))
+                                .orElse(null);
+                        logger.trace("Storing new message from {}", recipientId);
+                        // store message on disk, before acknowledging receipt to the server
+                        cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
                        try {
                            signalWebSocket.sendAck(it);
                        } catch (IOException e) {
@ -172,9 +168,6 @@ public class ReceiveHelper {
                backOffCounter = 0;

                if (queueNotEmpty) {
-                    if (cachedMessage[0] == null) {
-                        continue;
-                    }
                    if (remainingMessages > 0) {
                        remainingMessages -= 1;
                    }
@ -245,7 +238,7 @@ public class ReceiveHelper {
                    if (exception instanceof UntrustedIdentityException) {
                        logger.debug("Keeping message with untrusted identity in message cache");
                        final var address = ((UntrustedIdentityException) exception).getSender();
-                        if (envelope.getSourceServiceId() == null && address.aci().isPresent()) {
+                        if (envelope.getSourceServiceId().isEmpty() && address.aci().isPresent()) {
                            final var recipientId = account.getRecipientResolver()
                                    .resolveRecipient(ACI.parseOrThrow(address.aci().get()));
                            try {
@ -299,7 +292,7 @@ public class ReceiveHelper {
                cachedMessage.delete();
                return null;
            }
-            if (envelope.getSourceServiceId() == null) {
+            if (envelope.getSourceServiceId().isEmpty()) {
                final var identifier = ((UntrustedIdentityException) exception).getSender();
                final var recipientId = account.getRecipientResolver()
                        .resolveRecipient(new RecipientAddress(identifier));
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@ -11,13 +11,13 @@ import org.signal.core.models.ServiceId.ACI;
 import org.signal.core.models.ServiceId.PNI;
 import org.signal.libsignal.usernames.BaseUsernameException;
 import org.signal.libsignal.usernames.Username;
-import org.signal.network.exceptions.NonSuccessfulResponseCodeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.cds.CdsiV2Service;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidArgumentException;
 import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidTokenException;
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;

 import java.io.IOException;
 import java.util.Collection;
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@ -35,8 +35,6 @@ import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEditMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
-import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessage;
-import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessageRecipient;
 import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
 import org.whispersystems.signalservice.api.messages.calls.SignalServiceCallMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
@ -332,91 +330,6 @@ public class SendHelper {
        return result;
    }

-    /**
-     * Send a story message (file attachment) to "My Story".
-     */
-    public List<SendMessageResult> sendStoryMessage(
-            SignalServiceStoryMessage storyMessage,
-            long timestamp,
-            Set<RecipientId> recipientIds,
-            boolean allowsReplies
-    ) throws IOException {
-        final var messageSender = dependencies.getMessageSender();
-
-        final var recipientIdList = List.copyOf(recipientIds);
-        final var addressesMap = recipientIdList.stream()
-                .collect(Collectors.toMap(id -> id, context.getRecipientHelper()::resolveSignalServiceAddress));
-        final var unidentifiedAccessesMap = context.getUnidentifiedAccessHelper().getAccessFor(recipientIds);
-
-        final var addresses = recipientIdList.stream().map(addressesMap::get).toList();
-        final var unidentifiedAccesses = recipientIdList.stream().map(unidentifiedAccessesMap::get).toList();
-        final var storyMessageRecipients = recipientIdList.stream()
-                .map(id -> new SignalServiceStoryMessageRecipient(addressesMap.get(id),
-                        List.of(DistributionId.MY_STORY.asUuid().toString()),
-                        allowsReplies))
-                .collect(Collectors.toSet());
-
-        final List<SendMessageResult> results;
-        try {
-            results = messageSender.sendGroupStory(DistributionId.MY_STORY,
-                    Optional.empty(),
-                    addresses,
-                    unidentifiedAccesses,
-                    null,
-                    false,
-                    storyMessage,
-                    timestamp,
-                    storyMessageRecipients,
-                    null);
-        } catch (UntrustedIdentityException | InvalidKeyException | NoSessionException |
-                 InvalidRegistrationIdException e) {
-            throw new IOException(e);
-        }
-
-        for (var r : results) {
-            handleSendMessageResult(r);
-        }
-
-        return results;
-    }
-
-    /**
-     * Send a story message (file attachment) to a group.
-     */
-    public List<SendMessageResult> sendGroupStoryMessage(
-            SignalServiceStoryMessage storyMessage,
-            long timestamp,
-            GroupInfoV2 groupInfo,
-            boolean allowsReplies
-    ) throws IOException {
-        final var messageSender = dependencies.getMessageSender();
-
-        final var allRecipientIds = groupInfo.getMembersWithout(account.getSelfRecipientId());
-
-        final SenderKeySenderHandler senderKeySender = (distId, recipients, unidentifiedAccess, groupSendEndorsements, isRecipientUpdate) -> messageSender.sendGroupStory(
-                distId,
-                Optional.of(groupInfo.getMasterKey().serialize()),
-                recipients,
-                unidentifiedAccess,
-                groupSendEndorsements,
-                isRecipientUpdate,
-                storyMessage,
-                timestamp,
-                recipients.stream()
-                        .map(address -> new SignalServiceStoryMessageRecipient(address,
-                                List.of(groupInfo.getDistributionId().asUuid().toString()),
-                                allowsReplies))
-                        .collect(Collectors.toSet()),
-                null);
-        final var results = sendGroupMessageInternal(null, senderKeySender, allRecipientIds, groupInfo, false);
-
-        for (var r : results) {
-            handleSendMessageResult(r);
-        }
-
-        return results;
-    }
-
    private List<SendMessageResult> sendAsGroupMessage(
            final SignalServiceDataMessage.Builder messageBuilder,
            final GroupInfo g,
@ -567,7 +480,7 @@ public class SendHelper {
        return results;
    }

-    private GroupInfo getGroupForSending(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException, GroupSendingNotAllowedException {
+    private GroupInfo getGroupForSending(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {
        var g = context.getGroupHelper().getGroup(groupId);
        if (g == null) {
            throw new GroupNotFoundException(groupId);
@ -575,10 +488,6 @@ public class SendHelper {
        if (!g.isMember(account.getSelfRecipientId())) {
            throw new NotAGroupMemberException(groupId, g.getTitle());
        }
-        if (g.isTerminated()) {
-            // Other clients drop messages sent to a terminated group.
-            throw new GroupSendingNotAllowedException(groupId, g.getTitle());
-        }
        if (!g.isProfileSharingEnabled()) {
            g.setProfileSharingEnabled(true);
            account.getGroupStore().updateGroup(g);
@ -598,31 +507,9 @@ public class SendHelper {
    ) throws IOException {
        long startTime = System.currentTimeMillis();

-        // Recipients that are already known to be unregistered are skipped here.
-        // Otherwise every group send re-attempts them via the slow legacy 1:1
-        // fan-out, which on large groups can take tens of seconds (and time out).
-        // The unregistered flag is maintained independently by profile/CDS
-        // discovery, which clears it once a recipient registers again, so they
-        // are re-included automatically. An unregisteredFailure result is still
-        // returned for each skipped recipient, so callers see them unchanged.
-        final var skippedResults = new ArrayList<SendMessageResult>();
-        final Set<RecipientId> targetRecipientIds;
-        final var unregisteredRecipientIds = account.getRecipientStore().getUnregisteredRecipientIds(recipientIds);
-        if (unregisteredRecipientIds.isEmpty()) {
-            targetRecipientIds = recipientIds;
-        } else {
-            logger.debug("Skipping {} known-unregistered recipient(s) in group send.", unregisteredRecipientIds.size());
-            targetRecipientIds = new HashSet<>(recipientIds);
-            targetRecipientIds.removeAll(unregisteredRecipientIds);
-            for (final var recipientId : unregisteredRecipientIds) {
-                skippedResults.add(SendMessageResult.unregisteredFailure(context.getRecipientHelper()
-                        .resolveSignalServiceAddress(recipientId)));
-            }
-        }
-
-        final var addressesMap = targetRecipientIds.stream()
+        final var addressesMap = recipientIds.stream()
                .collect(Collectors.toMap(id -> id, context.getRecipientHelper()::resolveSignalServiceAddress));
-        final var unidentifiedAccessesMap = context.getUnidentifiedAccessHelper().getAccessFor(targetRecipientIds);
+        final var unidentifiedAccessesMap = context.getUnidentifiedAccessHelper().getAccessFor(recipientIds);
        final var groupSendEndorsementsResult = getGroupSendEndorsements(groupInfo);
        final var groupSecretParams = groupInfo instanceof GroupInfoV2 gv2
                ? GroupSecretParams.deriveFromMasterKey((gv2.getMasterKey()))
@ -636,7 +523,7 @@ public class SendHelper {
                : groupSendEndorsementsResult.first();
        Set<RecipientId> senderKeyTargets = groupInfo.getDistributionId() == null || groupSendEndorsements == null
                ? Set.of()
-                : targetRecipientIds.stream()
+                : recipientIds.stream()
                  .filter(s -> this.isSenderKeyCapable(s,
                          addressesMap.get(s),
                          unidentifiedAccessesMap.get(s),
@ -646,9 +533,7 @@ public class SendHelper {
            logger.debug("Too few sender-key-capable users ({}). Doing all legacy sends.", senderKeyTargets.size());
            senderKeyTargets = Set.of();
        } else {
-            logger.debug("Can use sender key for {}/{} recipients.",
-                    senderKeyTargets.size(),
-                    targetRecipientIds.size());
+            logger.debug("Can use sender key for {}/{} recipients.", senderKeyTargets.size(), recipientIds.size());
        }

        final var allResults = new ArrayList<SendMessageResult>(recipientIds.size());
@ -684,11 +569,11 @@ public class SendHelper {
            }
        }

-        final var legacyTargets = new HashSet<>(targetRecipientIds);
+        final var legacyTargets = new HashSet<>(recipientIds);
        legacyTargets.removeAll(senderKeyTargets);
-        final boolean onlyTargetIsSelfWithLinkedDevice = targetRecipientIds.isEmpty() && account.isMultiDevice();
+        final boolean onlyTargetIsSelfWithLinkedDevice = recipientIds.isEmpty() && account.isMultiDevice();

-        if (legacySender != null && (!legacyTargets.isEmpty() || onlyTargetIsSelfWithLinkedDevice)) {
+        if (!legacyTargets.isEmpty() || onlyTargetIsSelfWithLinkedDevice) {
            if (!legacyTargets.isEmpty()) {
                logger.debug("Need to do {} legacy sends.", legacyTargets.size());
            } else {
@ -720,7 +605,6 @@ public class SendHelper {
                    isRecipientUpdate || !allResults.isEmpty());
            allResults.addAll(results);
        }
-        allResults.addAll(skippedResults);
        final var duration = Duration.ofMillis(System.currentTimeMillis() - startTime);
        logger.debug("Sending took {}", duration.toString());
        return allResults;
@ -783,7 +667,7 @@ public class SendHelper {
            final var successCount = results.stream().filter(SendMessageResult::isSuccess).count();
            logger.debug("Successfully sent using 1:1 to {}/{} legacy targets.", successCount, addresses.size());
            return results;
-        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException | NoSessionException e) {
+        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
            return List.of();
        }
    }
@ -975,7 +859,7 @@ public class SendHelper {
                SignalServiceAddress address,
                SealedSenderAccess unidentifiedAccess,
                boolean includePniSignature
-        ) throws IOException, UnregisteredUserException, ProofRequiredException, RateLimitException, org.whispersystems.signalservice.api.crypto.UntrustedIdentityException, NoSessionException;
+        ) throws IOException, UnregisteredUserException, ProofRequiredException, RateLimitException, org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
    }

    interface SenderKeySenderHandler {
@ -995,6 +879,6 @@ public class SendHelper {
                List<SignalServiceAddress> recipients,
                List<SealedSenderAccess> unidentifiedAccess,
                boolean isRecipientUpdate
-        ) throws IOException, UntrustedIdentityException, NoSessionException;
+        ) throws IOException, UntrustedIdentityException;
    }
 }
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@ -2,19 +2,14 @@ package org.asamk.signal.manager.helper;

 import org.asamk.signal.manager.api.GroupIdV1;
 import org.asamk.signal.manager.api.GroupIdV2;
-import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.Profile;
-import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.asamk.signal.manager.syncStorage.AccountRecordProcessor;
 import org.asamk.signal.manager.syncStorage.ContactRecordProcessor;
 import org.asamk.signal.manager.syncStorage.GroupV1RecordProcessor;
 import org.asamk.signal.manager.syncStorage.GroupV2RecordProcessor;
-import org.asamk.signal.manager.syncStorage.StickerPackRecordProcessor;
-import org.asamk.signal.manager.syncStorage.StorageSyncLoopDetector;
 import org.asamk.signal.manager.syncStorage.StorageSyncModels;
 import org.asamk.signal.manager.syncStorage.StorageSyncValidations;
 import org.asamk.signal.manager.syncStorage.WriteOperationResult;
@ -22,9 +17,6 @@ import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.core.models.storageservice.StorageKey;
 import org.signal.core.util.SetUtil;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.network.service.StorageServiceService;
-import org.signal.network.service.StorageServiceService.ManifestIfDifferentVersionResult;
-import org.signal.network.service.StorageServiceService.WriteStorageRecordsResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
@ -33,6 +25,9 @@ import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
 import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
 import org.whispersystems.signalservice.api.storage.StorageId;
 import org.whispersystems.signalservice.api.storage.StorageRecordConvertersKt;
+import org.whispersystems.signalservice.api.storage.StorageServiceRepository;
+import org.whispersystems.signalservice.api.storage.StorageServiceRepository.ManifestIfDifferentVersionResult;
+import org.whispersystems.signalservice.api.storage.StorageServiceRepository.WriteStorageRecordsResult;
 import org.whispersystems.signalservice.internal.storage.protos.ManifestRecord;
 import org.whispersystems.signalservice.internal.storage.protos.StorageRecord;

@ -43,7 +38,6 @@ import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@ -56,19 +50,16 @@ public class StorageHelper {
    private static final List<Integer> KNOWN_TYPES = List.of(ManifestRecord.Identifier.Type.CONTACT.getValue(),
            ManifestRecord.Identifier.Type.GROUPV1.getValue(),
            ManifestRecord.Identifier.Type.GROUPV2.getValue(),
-            ManifestRecord.Identifier.Type.ACCOUNT.getValue(),
-            ManifestRecord.Identifier.Type.STICKER_PACK.getValue());
+            ManifestRecord.Identifier.Type.ACCOUNT.getValue());

    private final SignalAccount account;
    private final SignalDependencies dependencies;
    private final Context context;
-    private final StorageSyncLoopDetector storageSyncLoopDetector;

    public StorageHelper(final Context context) {
        this.account = context.getAccount();
        this.dependencies = context.getDependencies();
        this.context = context;
-        this.storageSyncLoopDetector = new StorageSyncLoopDetector(account::isMultiDevice);
    }

    public void syncDataWithStorage() throws IOException {
@ -87,7 +78,6 @@ public class StorageHelper {
        final var storageServiceRepository = dependencies.getStorageServiceRepository();
        final var result = storageServiceRepository.getStorageManifestIfDifferentVersion(storageKey,
                localManifestVersion);
-        final var fetchedRemoteManifest = result instanceof ManifestIfDifferentVersionResult.DifferentVersion;

        var needsForcePush = false;
        final var remoteManifest = switch (result) {
@ -128,7 +118,6 @@ public class StorageHelper {
        logger.trace("Adding missing storageIds to local data");
        account.getRecipientStore().setMissingStorageIds();
        account.getGroupStore().setMissingStorageIds();
-        account.getStickerStore().setMissingStorageIds();

        var needsMultiDeviceSync = false;

@ -150,10 +139,7 @@ public class StorageHelper {
            needsForcePush = true;
        } else {
            try {
-                needsMultiDeviceSync = writeToStorage(storageKey,
-                        remoteManifest,
-                        needsForcePush,
-                        fetchedRemoteManifest);
+                needsMultiDeviceSync = writeToStorage(storageKey, remoteManifest, needsForcePush);
            } catch (RetryLaterException e) {
                // TODO retry later
                return;
@ -225,26 +211,20 @@ public class StorageHelper {
                            remoteOnlyRecords.size());
                }

-                final var listListPair = processKnownRecords(connection, remoteOnlyRecords);
-                final var unknownInserts = listListPair.first();
-                final var updatedStorageIds = listListPair.second();
-                final var oldUnregisteredLocalOnlyIds = new HashSet<>(idDifference.localOnlyIds());
-                updatedStorageIds.forEach(oldUnregisteredLocalOnlyIds::remove);
-                if (!idDifference.localOnlyIds().isEmpty()) {
-                    final var updated = account.getRecipientStore()
-                            .removeStorageIdsFromLocalOnlyUnregisteredRecipients(connection,
-                                    oldUnregisteredLocalOnlyIds);
-                    final var updatedStickers = account.getStickerStore()
-                            .removeStorageIdsFromLocalOnlyDeletedStickerPacks(connection, oldUnregisteredLocalOnlyIds);
-
-                    if (updated > 0 || updatedStickers > 0) {
-                        logger.warn(
-                                "Found {} recipients and {} sticker packs that were deleted remotely but only marked deleted locally. Removed those from local store.",
-                                updated,
-                                updatedStickers);
-                    }
-                }
-
+                // This logic is wrong, records should only be deleted if they're deleted remotely, not if the remote record is updated
+//                if (!idDifference.localOnlyIds().isEmpty()) {
+//                    final var updated = account.getRecipientStore()
+//                            .removeStorageIdsFromLocalOnlyUnregisteredRecipients(connection,
+//                                    idDifference.localOnlyIds());
+//
+//                    if (updated > 0) {
+//                        logger.warn(
+//                                "Found {} records that were deleted remotely but only marked unregistered locally. Removed those from local store.",
+//                                updated);
+//                    }
+//                }
+//
+                final var unknownInserts = processKnownRecords(connection, remoteOnlyRecords);
                final var unknownDeletes = idDifference.localOnlyIds()
                        .stream()
                        .filter(id -> !KNOWN_TYPES.contains(id.getType()))
@ -295,8 +275,7 @@ public class StorageHelper {
    private boolean writeToStorage(
            final StorageKey storageKey,
            final SignalStorageManifest remoteManifest,
-            final boolean needsForcePush,
-            final boolean fetchedRemoteManifest
+            final boolean needsForcePush
    ) throws IOException, RetryLaterException {
        final WriteOperationResult remoteWriteOperation;
        try (final var connection = account.getAccountDatabase().getConnection()) {
@ -334,19 +313,6 @@ public class StorageHelper {

        if (remoteWriteOperation.isEmpty()) {
            logger.debug("No remote writes needed. Still at version: {}", remoteManifest.version);
-            storageSyncLoopDetector.onConverged();
-            return false;
-        }
-
-        final var loopCheck = storageSyncLoopDetector.onWriteAttempt(remoteWriteOperation,
-                fetchedRemoteManifest,
-                false);
-        if (loopCheck instanceof StorageSyncLoopDetector.Decision.Denied denied) {
-            logger.warn(
-                    "Skipping remote write, another device is likely undoing it. Cause: {}, level: {}. WriteOperationResult :: {}",
-                    denied.cause(),
-                    denied.level(),
-                    remoteWriteOperation);
            return false;
        }

@ -365,18 +331,11 @@ public class StorageHelper {
                        remoteWriteOperation.deletes());
        switch (result) {
            case WriteStorageRecordsResult.ConflictError ignored -> {
-                storageSyncLoopDetector.onWriteFailed();
                logger.debug("Hit a conflict when trying to resolve the conflict! Retrying.");
                throw new RetryLaterException();
            }
-            case WriteStorageRecordsResult.NetworkError networkError -> {
-                storageSyncLoopDetector.onWriteFailed();
-                throw networkError.getException();
-            }
-            case WriteStorageRecordsResult.StatusCodeError statusCodeError -> {
-                storageSyncLoopDetector.onWriteFailed();
-                throw statusCodeError.getException();
-            }
+            case WriteStorageRecordsResult.NetworkError networkError -> throw networkError.getException();
+            case WriteStorageRecordsResult.StatusCodeError statusCodeError -> throw statusCodeError.getException();
            case WriteStorageRecordsResult.Success ignored -> {
                logger.debug("Saved new manifest. Now at version: {}", remoteWriteOperation.manifest().version);
                storeManifestLocally(remoteWriteOperation.manifest());
@ -402,7 +361,6 @@ public class StorageHelper {
        final Map<RecipientId, StorageId> newContactStorageIds;
        final Map<GroupIdV1, StorageId> newGroupV1StorageIds;
        final Map<GroupIdV2, StorageId> newGroupV2StorageIds;
-        final Map<StickerPackId, StorageId> newStickerPackStorageIds;

        try (final var connection = account.getAccountDatabase().getConnection()) {
            connection.setAutoCommit(false);
@ -449,19 +407,6 @@ public class StorageHelper {
                        new StorageRecord.Builder().groupV2(record).build()));
            }

-            final var stickerPacks = account.getStickerStore()
-                    .getStickerPacks(connection)
-                    .stream()
-                    .filter(pack -> pack.storageId() != null)
-                    .toList();
-            newStickerPackStorageIds = generateStickerPackStorageIds(stickerPacks);
-            for (final var stickerPack : stickerPacks) {
-                final var storageId = newStickerPackStorageIds.get(stickerPack.packId());
-                final var record = StorageSyncModels.localToRemoteRecord(stickerPack);
-                newStorageRecords.add(new SignalStorageRecord(storageId,
-                        new StorageRecord.Builder().stickerPack(record).build()));
-            }
-
            connection.commit();
        } catch (SQLException e) {
            throw new RuntimeException("Failed to sync remote storage", e);
@ -512,7 +457,6 @@ public class StorageHelper {
            connection.setAutoCommit(false);
            account.getRecipientStore().updateStorageIds(connection, newContactStorageIds);
            account.getGroupStore().updateStorageIds(connection, newGroupV1StorageIds, newGroupV2StorageIds);
-            account.getStickerStore().updateStorageIds(connection, newStickerPackStorageIds);

            // delete all unknown storage ids
            account.getUnknownStorageIdStore().deleteAllUnknownStorageIds(connection);
@ -536,21 +480,13 @@ public class StorageHelper {
    private Map<GroupIdV1, StorageId> generateGroupV1StorageIds(List<GroupIdV1> groupIds) {
        return groupIds.stream()
                .collect(Collectors.toMap(recipientId -> recipientId,
-                        _ -> StorageId.forGroupV1(KeyUtils.createRawStorageId())));
+                        recipientId -> StorageId.forGroupV1(KeyUtils.createRawStorageId())));
    }

    private Map<GroupIdV2, StorageId> generateGroupV2StorageIds(List<GroupIdV2> groupIds) {
        return groupIds.stream()
                .collect(Collectors.toMap(recipientId -> recipientId,
-                        _ -> StorageId.forGroupV2(KeyUtils.createRawStorageId())));
-    }
-
-    private Map<StickerPackId, StorageId> generateStickerPackStorageIds(
-            final List<StickerPack> stickerPacks
-    ) {
-        return stickerPacks.stream()
-                .collect(Collectors.toMap(stickerPack -> stickerPack.packId(),
-                        _ -> StorageId.forStickerPack(KeyUtils.createRawStorageId())));
+                        recipientId -> StorageId.forGroupV2(KeyUtils.createRawStorageId())));
    }

    private void storeManifestLocally(
@ -568,7 +504,7 @@ public class StorageHelper {
        final var result = dependencies.getStorageServiceRepository()
                .readStorageRecords(storageKey, manifest.recordIkm, storageIds);
        return switch (result) {
-            case StorageServiceService.StorageRecordResult.DecryptionError decryptionError -> {
+            case StorageServiceRepository.StorageRecordResult.DecryptionError decryptionError -> {
                if (decryptionError.getException() instanceof InvalidKeyException) {
                    logger.warn("Failed to read storage records, ignoring.");
                    yield List.of();
@ -578,11 +514,11 @@ public class StorageHelper {
                    throw new IOException(decryptionError.getException());
                }
            }
-            case StorageServiceService.StorageRecordResult.NetworkError networkError ->
+            case StorageServiceRepository.StorageRecordResult.NetworkError networkError ->
                    throw networkError.getException();
-            case StorageServiceService.StorageRecordResult.StatusCodeError statusCodeError ->
+            case StorageServiceRepository.StorageRecordResult.StatusCodeError statusCodeError ->
                    throw statusCodeError.getException();
-            case StorageServiceService.StorageRecordResult.Success success -> success.getRecords();
+            case StorageServiceRepository.StorageRecordResult.Success success -> success.getRecords();
            default -> throw new IllegalStateException("Unexpected value: " + result);
        };
    }
@ -592,7 +528,6 @@ public class StorageHelper {
        storageIds.addAll(account.getUnknownStorageIdStore().getUnknownStorageIds(connection));
        storageIds.addAll(account.getGroupStore().getStorageIds(connection));
        storageIds.addAll(account.getRecipientStore().getStorageIds(connection));
-        storageIds.addAll(account.getStickerStore().getStorageIds(connection));
        storageIds.add(account.getRecipientStore().getSelfStorageId(connection));
        return storageIds;
    }
@ -641,14 +576,6 @@ public class StorageHelper {
                        account.getUsernameLink());
                yield new SignalStorageRecord(storageId, new StorageRecord.Builder().account(record).build());
            }
-            case ManifestRecord.Identifier.Type.STICKER_PACK -> {
-                final var stickerPack = account.getStickerStore().getStickerPack(connection, storageId);
-                if (stickerPack == null) {
-                    throw new AssertionError("Missing local sticker pack model for storage id: " + storageId);
-                }
-                final var record = StorageSyncModels.localToRemoteRecord(stickerPack);
-                yield new SignalStorageRecord(storageId, new StorageRecord.Builder().stickerPack(record).build());
-            }
            case null, default -> {
                throw new AssertionError("Got unknown local storage record type: " + storageId);
            }
@ -703,25 +630,16 @@ public class StorageHelper {
        return new IdDifferenceResult(remoteOnlyKeys, localOnlyKeys, hasTypeMismatch);
    }

-    private Pair<List<StorageId>, List<StorageId>> processKnownRecords(
+    private List<StorageId> processKnownRecords(
            final Connection connection,
            List<SignalStorageRecord> records
    ) throws SQLException {
        final var unknownRecords = new ArrayList<StorageId>();
-        final var processedRecords = new ArrayList<StorageId>();

        final var accountRecordProcessor = new AccountRecordProcessor(account, connection, context.getJobExecutor());
+        final var contactRecordProcessor = new ContactRecordProcessor(account, connection, context.getJobExecutor());
        final var groupV1RecordProcessor = new GroupV1RecordProcessor(account, connection);
        final var groupV2RecordProcessor = new GroupV2RecordProcessor(account, connection);
-        final var contactRecordProcessor = new ContactRecordProcessor(account, connection, context.getJobExecutor());
-        final var stickerPackRecordProcessor = new StickerPackRecordProcessor(account, connection);
-
-        final var contactRecords = records.stream()
-                .filter(record -> record.getProto().contact != null)
-                .map(record -> StorageRecordConvertersKt.toSignalContactRecord(record.getProto().contact,
-                        record.getId()))
-                .toList();
-        contactRecordProcessor.prepare(contactRecords);

        for (final var record : records) {
            if (record.getProto().account != null) {
@ -740,21 +658,12 @@ public class StorageHelper {
                logger.debug("Reading record {} of type contact", record.getId());
                contactRecordProcessor.process(StorageRecordConvertersKt.toSignalContactRecord(record.getProto().contact,
                        record.getId()));
-            } else if (record.getProto().stickerPack != null) {
-                logger.debug("Reading record {} of type stickerPack", record.getId());
-                stickerPackRecordProcessor.process(StorageRecordConvertersKt.toSignalStickerPackRecord(record.getProto().stickerPack,
-                        record.getId()));
            } else {
                unknownRecords.add(record.getId());
            }
        }
-        processedRecords.addAll(accountRecordProcessor.getUpdatedStorageIds());
-        processedRecords.addAll(groupV1RecordProcessor.getUpdatedStorageIds());
-        processedRecords.addAll(groupV2RecordProcessor.getUpdatedStorageIds());
-        processedRecords.addAll(contactRecordProcessor.getUpdatedStorageIds());
-        processedRecords.addAll(stickerPackRecordProcessor.getUpdatedStorageIds());

-        return new Pair<>(unknownRecords, processedRecords);
+        return unknownRecords;
    }

    /**
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@ -160,7 +160,7 @@ public class SyncHelper {

        try {
            try (OutputStream fos = new FileOutputStream(contactsFile)) {
-                var out = new DeviceContactsOutputStream(fos);
+                var out = new DeviceContactsOutputStream(fos, true, true);
                for (var contactPair : account.getContactStore().getContacts()) {
                    final var recipientId = contactPair.first();
                    final var contact = contactPair.second();
@ -237,19 +237,18 @@ public class SyncHelper {
                final var address = account.getRecipientAddressResolver().resolveRecipientAddress(record.first());
                if (address.aci().isPresent() || address.number().isPresent()) {
                    addresses.add(new BlockedListMessage.Individual(address.aci().orElse(null),
-                            address.number().orElse(null),
-                            record.second().blockedAt()));
+                            address.number().orElse(null)));
                }
            }
        }
-        var groups = new ArrayList<BlockedListMessage.Group>();
+        var groupIds = new ArrayList<byte[]>();
        for (var record : account.getGroupStore().getGroups()) {
            if (record.isBlocked()) {
-                groups.add(new BlockedListMessage.Group(record.getGroupId().serialize(), record.getBlockedAt()));
+                groupIds.add(record.getGroupId().serialize());
            }
        }
        return context.getSendHelper()
-                .sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(addresses, groups)));
+                .sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(addresses, groupIds)));
    }

    public SendMessageResult sendVerifiedMessage(
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@ -83,7 +83,6 @@ import org.asamk.signal.manager.storage.AttachmentStore;
 import org.asamk.signal.manager.storage.AvatarStore;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
-import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.asamk.signal.manager.storage.identities.IdentityInfo;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
@ -98,23 +97,16 @@ import org.asamk.signal.manager.util.StickerUtils;
 import org.signal.core.models.ServiceId;
 import org.signal.core.models.ServiceId.ACI;
 import org.signal.core.models.ServiceId.PNI;
+import org.signal.core.util.Base64;
 import org.signal.core.util.Hex;
-import org.signal.core.util.crypto.DeviceName;
-import org.signal.core.util.crypto.DeviceNameCipher;
-import org.signal.libsignal.net.LinkedDevice;
 import org.signal.libsignal.protocol.InvalidMessageException;
-import org.signal.libsignal.protocol.NoSessionException;
 import org.signal.libsignal.usernames.BaseUsernameException;
-import org.signal.network.exceptions.NonSuccessfulResponseCodeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
 import org.whispersystems.signalservice.api.messages.SignalServicePreview;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
-import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
 import org.whispersystems.signalservice.api.messages.calls.AnswerMessage;
 import org.whispersystems.signalservice.api.messages.calls.BusyMessage;
@ -122,8 +114,11 @@ import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
 import org.whispersystems.signalservice.api.messages.calls.IceUpdateMessage;
 import org.whispersystems.signalservice.api.messages.calls.OfferMessage;
 import org.whispersystems.signalservice.api.messages.calls.SignalServiceCallMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.exceptions.CdsiResourceExhaustedException;
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.internal.util.Util;

@ -160,7 +155,6 @@ import okio.Utf8;

 import static org.asamk.signal.manager.config.ServiceConfig.MAX_MESSAGE_SIZE_BYTES;
 import static org.asamk.signal.manager.util.Utils.handleResponseException;
-import static org.asamk.signal.manager.util.Utils.handleResponseExceptionSuspend;
 import static org.signal.core.util.StringExtensionsKt.splitByByteLength;

 public class ManagerImpl implements Manager {
@ -196,7 +190,6 @@ public class ManagerImpl implements Manager {
                userAgent,
                account.getCredentialsProvider(),
                account.getSignalServiceDataStore(),
-                account.getDeviceId(),
                executor,
                sessionLock);
        final var avatarStore = new AvatarStore(pathConfig.avatarsPath());
@ -250,11 +243,6 @@ public class ManagerImpl implements Manager {
        return account.getNumber();
    }

-    @Override
-    public String getSelfACI() {
-        return account.getAci().toString();
-    }
-
    public void checkAccountState() throws IOException {
        context.getAccountHelper().checkAccountState();
        final var lastRecipientsRefresh = account.getLastRecipientsRefresh();
@ -484,26 +472,23 @@ public class ManagerImpl implements Manager {

    @Override
    public List<Device> getLinkedDevices() throws IOException {
-        final List<LinkedDevice> devices = handleResponseExceptionSuspend(cont -> dependencies.getLinkDeviceApi()
-                .getDevices(cont));
+        var devices = handleResponseException(dependencies.getLinkDeviceApi().getDevices());
        account.setMultiDevice(devices.size() > 1);
-        var identityKey = account.getAciIdentityKeyPair();
+        var identityKey = account.getAciIdentityKeyPair().getPrivateKey();
        return devices.stream().map(d -> {
-            String deviceName = null;
-            if (d.getEncryptedName() != null && d.getEncryptedName().length > 0) {
+            String deviceName = d.getName();
+            if (deviceName != null) {
                try {
-                    deviceName = new String(DeviceNameCipher.decryptDeviceName(DeviceName.ADAPTER.decode(d.getEncryptedName()),
-                            identityKey), StandardCharsets.UTF_8);
-                } catch (Exception e) {
+                    deviceName = DeviceNameUtil.decryptDeviceName(deviceName, identityKey);
+                } catch (IOException e) {
                    logger.debug("Failed to decrypt device name, maybe plain text?", e);
-                    deviceName = new String(d.getEncryptedName(), StandardCharsets.UTF_8);
                }
            }
            final var createdAt = getPlaintextCreatedAt(d);
            return new Device(d.getId(),
                    deviceName,
                    createdAt == null ? 0 : createdAt,
-                    d.getLastSeen().toEpochMilli(),
+                    d.getLastSeen(),
                    d.getId() == account.getDeviceId());
        }).toList();
    }
@ -523,7 +508,7 @@ public class ManagerImpl implements Manager {
        }
    }

-    private Long getPlaintextCreatedAt(LinkedDevice d) {
+    private Long getPlaintextCreatedAt(DeviceInfo d) {
        final var DECRYPTION_INFO = "deviceCreatedAt";
        var identityKey = account.getAciIdentityKeyPair().getPrivateKey();
        try {
@ -531,9 +516,8 @@ public class ManagerImpl implements Manager {
            var associatedData = new ByteArrayOutputStream();
            associatedData.write(d.getId());
            associatedData.write(ByteBuffer.allocate(4).putInt(d.getRegistrationId()).array());
-            var createdAtPlaintext = identityKey.open(d.getCreatedAtCiphertext(),
-                    DECRYPTION_INFO,
-                    associatedData.toByteArray());
+            var createdAtPlaintext = identityKey.open(Base64.decode(d.getCreatedAtCiphertext()
+                    .getBytes(StandardCharsets.UTF_8)), DECRYPTION_INFO, associatedData.toByteArray());
            return ByteBuffer.wrap(createdAtPlaintext).getLong();
        } catch (Exception e) {
            logger.warn("Failed while reading the protobuf.", e);
@ -610,11 +594,6 @@ public class ManagerImpl implements Manager {
        context.getGroupHelper().deleteGroup(groupId);
    }

-    @Override
-    public SendGroupMessageResults terminateGroup(GroupId groupId) throws IOException, GroupNotFoundException, NotAGroupMemberException {
-        return context.getGroupHelper().terminateGroup(groupId);
-    }
-
    @Override
    public Pair<GroupId, SendGroupMessageResults> createGroup(
            String name,
@ -806,20 +785,13 @@ public class ManagerImpl implements Manager {
    ) {
        try {
            final var recipientId = context.getRecipientHelper().resolveRecipient(sender);
-            List<SendMessageResult> results;
-            if (receiptMessage.isDeliveryReceipt() || !Boolean.FALSE.equals(account.getConfigurationStore()
-                    .getReadReceipts())) {
-                final var result = context.getSendHelper().sendReceiptMessage(receiptMessage, recipientId);
-                results = List.of(toSendMessageResult(result));
-            } else {
-                results = List.of();
-            }
+            final var result = context.getSendHelper().sendReceiptMessage(receiptMessage, recipientId);

            final var aci = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId).aci();
            if (aci.isPresent()) {
                context.getSyncHelper().sendSyncReceiptMessage(aci.get(), receiptMessage);
            }
-            return new SendMessageResults(timestamp, Map.of(sender, results));
+            return new SendMessageResults(timestamp, Map.of(sender, List.of(toSendMessageResult(result))));
        } catch (UnregisteredRecipientException e) {
            return new SendMessageResults(timestamp,
                    Map.of(sender, List.of(SendMessageResult.unregisteredFailure(sender.toPartialRecipientAddress()))));
@ -853,98 +825,6 @@ public class ManagerImpl implements Manager {
        return sendMessage(messageBuilder, recipients, false, Optional.of(editTargetTimestamp), message.urgent());
    }

-    @Override
-    public SendMessageResults sendStory(
-            String attachment,
-            boolean allowsReplies,
-            Optional<GroupId> groupId
-    ) throws IOException, AttachmentInvalidException, GroupNotFoundException, NotAGroupMemberException {
-        final var file = new File(attachment);
-        final var mimeType = MimeUtils.getFileMimeType(file);
-        if (mimeType.isEmpty() || (!mimeType.get().startsWith("image/") && !mimeType.get().startsWith("video/"))) {
-            throw new AttachmentInvalidException(attachment,
-                    new IOException("Stories only support image and video attachments"));
-        }
-
-        if (groupId.isPresent()) {
-            return sendGroupStory(attachment, allowsReplies, groupId.get());
-        }
-
-        final var recipients = account.getRecipientStore()
-                .getRecipients(true, Optional.of(false), Set.of(), Optional.empty());
-        final var recipientIds = recipients.stream()
-                .filter(r -> !r.getRecipientId().equals(account.getSelfRecipientId()))
-                .filter(r -> r.getContact() != null && !r.getContact().hideStory())
-                .map(r -> r.getRecipientId())
-                .collect(Collectors.toSet());
-
-        if (recipientIds.isEmpty()) {
-            throw new IOException("No eligible contacts found for story delivery");
-        }
-
-        final var uploadedAttachment = context.getAttachmentHelper().uploadAttachment(attachment);
-        final var storyMessage = SignalServiceStoryMessage.forFileAttachment(account.getProfileKey().serialize(),
-                null,
-                uploadedAttachment,
-                allowsReplies,
-                List.of());
-        final var timestamp = getNextMessageTimestamp();
-
-        final var sendResults = context.getSendHelper()
-                .sendStoryMessage(storyMessage, timestamp, recipientIds, allowsReplies);
-
-        final var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
-        for (final var sendResult : sendResults) {
-            final var result = toSendMessageResult(sendResult);
-            results.put(RecipientIdentifier.Single.fromAddress(result.address()), List.of(result));
-        }
-
-        return new SendMessageResults(timestamp, results);
-    }
-
-    private SendMessageResults sendGroupStory(
-            String attachment,
-            boolean allowsReplies,
-            GroupId groupId
-    ) throws IOException, AttachmentInvalidException, GroupNotFoundException, NotAGroupMemberException {
-        final var groupInfo = context.getGroupHelper().getGroup(groupId);
-        if (groupInfo == null) {
-            throw new GroupNotFoundException(groupId);
-        }
-        if (!groupInfo.isMember(account.getSelfRecipientId())) {
-            throw new NotAGroupMemberException(groupId, groupInfo.getTitle());
-        }
-        if (!(groupInfo instanceof GroupInfoV2 groupInfoV2)) {
-            throw new IOException("Stories are only supported for V2 groups");
-        }
-        if (groupInfoV2.isTerminated()) {
-            // Other clients drop messages sent to a terminated group.
-            throw new IOException("Cannot send a story to a group that has been terminated");
-        }
-
-        final var uploadedAttachment = context.getAttachmentHelper().uploadAttachment(attachment);
-        final var groupContext = SignalServiceGroupV2.newBuilder(groupInfoV2.getMasterKey())
-                .withRevision(groupInfoV2.getGroup() == null ? 0 : groupInfoV2.getGroup().revision)
-                .build();
-        final var storyMessage = SignalServiceStoryMessage.forFileAttachment(account.getProfileKey().serialize(),
-                groupContext,
-                uploadedAttachment,
-                allowsReplies,
-                List.of());
-        final var timestamp = getNextMessageTimestamp();
-
-        final var sendResults = context.getSendHelper()
-                .sendGroupStoryMessage(storyMessage, timestamp, groupInfoV2, allowsReplies);
-
-        final var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
-        for (final var sendResult : sendResults) {
-            final var result = toSendMessageResult(sendResult);
-            results.put(RecipientIdentifier.Single.fromAddress(result.address()), List.of(result));
-        }
-
-        return new SendMessageResults(timestamp, results);
-    }
-
    private void applyMessage(
            final SignalServiceDataMessage.Builder messageBuilder,
            final Message message
@ -1211,26 +1091,30 @@ public class ManagerImpl implements Manager {
    }

    @Override
-    public void sendEndSessionMessage(Set<RecipientIdentifier.Single> recipients) throws IOException {
-        for (var recipient : recipients) {
-            final RecipientId recipientId;
-            try {
-                recipientId = context.getRecipientHelper().resolveRecipient(recipient);
-            } catch (UnregisteredRecipientException e) {
-                continue;
-            }
-            final var recipientAddress = context.getAccount()
-                    .getRecipientAddressResolver()
-                    .resolveRecipientAddress(recipientId);
-            final var aciSessionStore = account.getAccountData(ServiceIdType.ACI).getSessionStore();
-            final var pniSessionStore = account.getAccountData(ServiceIdType.PNI).getSessionStore();
-            if (recipientAddress.aci().isPresent()) {
-                aciSessionStore.archiveSessions(recipientAddress.aci().get());
-                pniSessionStore.archiveSessions(recipientAddress.aci().get());
-            }
-            if (recipientAddress.pni().isPresent()) {
-                aciSessionStore.archiveSessions(recipientAddress.pni().get());
-                pniSessionStore.archiveSessions(recipientAddress.pni().get());
+    public SendMessageResults sendEndSessionMessage(Set<RecipientIdentifier.Single> recipients) throws IOException {
+        var messageBuilder = SignalServiceDataMessage.newBuilder().asEndSessionMessage();
+
+        try {
+            return sendMessage(messageBuilder,
+                    recipients.stream().map(RecipientIdentifier.class::cast).collect(Collectors.toSet()),
+                    false);
+        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+            throw new AssertionError(e);
+        } finally {
+            for (var recipient : recipients) {
+                final RecipientId recipientId;
+                try {
+                    recipientId = context.getRecipientHelper().resolveRecipient(recipient);
+                } catch (UnregisteredRecipientException e) {
+                    continue;
+                }
+                final var serviceId = context.getAccount()
+                        .getRecipientAddressResolver()
+                        .resolveRecipientAddress(recipientId)
+                        .serviceId();
+                if (serviceId.isPresent()) {
+                    account.getAccountData(ServiceIdType.ACI).getSessionStore().deleteAllSessions(serviceId.get());
+                }
            }
        }
    }
@ -1715,15 +1599,8 @@ public class ManagerImpl implements Manager {
        }

        final var contact = account.getContactStore().getContact(recipientId);
-        if (contact != null) {
-            final var nickname = contact.getDisplayNickname();
-            if (!Util.isEmpty(nickname)) {
-                return nickname;
-            }
-
-            if (!Util.isEmpty(contact.getName())) {
-                return contact.getName();
-            }
+        if (contact != null && !Util.isEmpty(contact.getName())) {
+            return contact.getName();
        }

        final var profile = context.getProfileHelper().getRecipientProfile(recipientId);
@ -1944,10 +1821,8 @@ public class ManagerImpl implements Manager {
        var callMessage = SignalServiceCallMessage.forOffer(offerMessage, null);
        try {
            dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
-        } catch (UntrustedIdentityException e) {
+        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
            throw new IOException("Untrusted identity for call recipient", e);
-        } catch (NoSessionException e) {
-            throw new IOException("No session for call recipient", e);
        }
    }

@ -1963,10 +1838,8 @@ public class ManagerImpl implements Manager {
        var callMessage = SignalServiceCallMessage.forAnswer(answerMessage, null);
        try {
            dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
-        } catch (UntrustedIdentityException e) {
+        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
            throw new IOException("Untrusted identity for call recipient", e);
-        } catch (NoSessionException e) {
-            throw new IOException("No session for call recipient", e);
        }
    }

@ -1982,10 +1855,8 @@ public class ManagerImpl implements Manager {
        var callMessage = SignalServiceCallMessage.forIceUpdates(iceUpdates, null);
        try {
            dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
-        } catch (UntrustedIdentityException e) {
+        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
            throw new IOException("Untrusted identity for call recipient", e);
-        } catch (NoSessionException e) {
-            throw new IOException("No session for call recipient", e);
        }
    }

@ -2008,10 +1879,8 @@ public class ManagerImpl implements Manager {
        var callMessage = SignalServiceCallMessage.forHangup(hangupMessage, null);
        try {
            dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
-        } catch (UntrustedIdentityException e) {
+        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
            throw new IOException("Untrusted identity for call recipient", e);
-        } catch (NoSessionException e) {
-            throw new IOException("No session for call recipient", e);
        }
    }

@ -2026,10 +1895,8 @@ public class ManagerImpl implements Manager {
        var callMessage = SignalServiceCallMessage.forBusy(busyMessage, null);
        try {
            dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
-        } catch (UntrustedIdentityException e) {
+        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
            throw new IOException("Untrusted identity for call recipient", e);
-        } catch (NoSessionException e) {
-            throw new IOException("No session for call recipient", e);
        }
    }

--- a/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
@ -7,7 +7,6 @@ import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.SignalAccountFiles;
 import org.asamk.signal.manager.api.AccountCheckException;
 import org.asamk.signal.manager.api.NotRegisteredException;
-import org.signal.core.util.UuidUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@ -96,47 +95,23 @@ public class MultiAccountManagerImpl implements MultiAccountManager {
    }

    @Override
-    public Manager getManager(final String identifier) {
+    public Manager getManager(final String number) {
        synchronized (managers) {
-            if (UuidUtil.INSTANCE.isUuid(identifier)) {
-                // Check if UUID corresponds to an already-loaded manager
-                final var existing = managers.stream()
-                        .filter(m -> m.getSelfACI().equals(identifier))
-                        .findFirst()
-                        .orElse(null);
-                if (existing != null) {
-                    logger.debug("Found already loaded manager for ACI: {}", identifier);
-                    return existing;
-                }
-                // Load by ACI
-                try {
-                    final var newManager = signalAccountFiles.initManagerByAci(identifier);
-                    managers.add(newManager);
-                    return newManager;
-                } catch (NotRegisteredException e) {
-                    logger.debug("Manager not found by ACI: {}", identifier);
-                } catch (IOException | IllegalArgumentException | AccountCheckException e) {
-                    logger.warn("Failed to load new manager by ACI: {}", identifier, e);
-                }
-            } else {
-                // Phone number — check already loaded managers
-                var existing = managers.stream()
-                        .filter(m -> m.getSelfNumber().equals(identifier))
-                        .findFirst()
-                        .orElse(null);
-                if (existing != null) {
-                    return existing;
-                }
-                // Load by phone number
-                try {
-                    final var newManager = signalAccountFiles.initManagerByNumber(identifier);
-                    managers.add(newManager);
-                    return newManager;
-                } catch (NotRegisteredException | IOException | IllegalArgumentException | AccountCheckException e) {
-                    logger.warn("Failed to load manager by number: {}", identifier, e);
-                }
+            final var manager = managers.stream()
+                    .filter(m -> m.getSelfNumber().equals(number))
+                    .findFirst()
+                    .orElse(null);
+            if (manager != null) {
+                return manager;
+            }
+            try {
+                final var newManager = signalAccountFiles.initManager(number);
+                managers.add(newManager);
+                return newManager;
+            } catch (IOException | NotRegisteredException | AccountCheckException e) {
+                logger.warn("Failed to load new manager", e);
+                return null;
            }
-            return null;
        }
    }

--- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@ -19,57 +19,34 @@ package org.asamk.signal.manager.internal;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.Settings;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.UserAlreadyExistsException;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
 import org.asamk.signal.manager.util.KeyUtils;
-import org.signal.core.models.AccountEntropyPool;
-import org.signal.core.models.ServiceId.ACI;
-import org.signal.core.models.ServiceId.PNI;
-import org.signal.core.models.backup.MediaRootBackupKey;
-import org.signal.core.util.crypto.DeviceNameCipher;
-import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.IdentityKeyPair;
-import org.signal.libsignal.protocol.ecc.ECPrivateKey;
-import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.account.DeviceAttributes;
-import org.whispersystems.signalservice.api.provisioning.ProvisioningSocket;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
-import org.whispersystems.signalservice.internal.crypto.SecondaryProvisioningCipher;
-import org.whispersystems.signalservice.internal.push.ProvisionMessage;
+import org.whispersystems.signalservice.api.registration.ProvisioningApi;
+import org.whispersystems.signalservice.api.util.DeviceNameUtil;
+import org.whispersystems.signalservice.internal.push.ProvisioningSocket;
+import org.whispersystems.signalservice.internal.push.PushServiceSocket;
+import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;

-import java.io.Closeable;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.channels.OverlappingFileLockException;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;

-import kotlin.ResultKt;
-import kotlin.Unit;
-import kotlin.coroutines.Continuation;
-import kotlin.coroutines.EmptyCoroutineContext;
-import kotlin.coroutines.intrinsics.IntrinsicsKt;
-import kotlin.jvm.functions.Function3;
-import kotlinx.coroutines.BuildersKt;
-import kotlinx.coroutines.CoroutineScope;
-
 import static org.asamk.signal.manager.util.KeyUtils.generatePreKeysForType;
-import static org.asamk.signal.manager.util.Utils.handleResponseException;

-public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
+public class ProvisioningManagerImpl implements ProvisioningManager {

    private static final Logger logger = LoggerFactory.getLogger(ProvisioningManagerImpl.class);

@ -79,10 +56,9 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
    private final Consumer<Manager> newManagerListener;
    private final AccountsStore accountsStore;

+    private final ProvisioningApi provisioningApi;
+    private final IdentityKeyPair tempIdentityKey;
    private final String password;
-    private final CompletableFuture<String> urlFuture = new CompletableFuture<>();
-    private final CompletableFuture<SecondaryProvisioningCipher.ProvisioningDecryptResult<ProvisionMessage>> messageFuture = new CompletableFuture<>();
-    private final Closeable socketHandle;

    public ProvisioningManagerImpl(
            PathConfig pathConfig,
@ -97,58 +73,35 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
        this.newManagerListener = newManagerListener;
        this.accountsStore = accountsStore;

-        final IdentityKeyPair tempIdentityKey = KeyUtils.generateIdentityKeyPair();
+        tempIdentityKey = KeyUtils.generateIdentityKeyPair();
        password = KeyUtils.createPassword();
-
-        socketHandle = ProvisioningSocket.Companion.start(new ProvisioningSocket.Mode.Link(false),
-                tempIdentityKey,
-                serviceEnvironmentConfig.signalServiceConfiguration(),
-                (id, t) -> {
-                    urlFuture.completeExceptionally(t);
-                    messageFuture.completeExceptionally(t);
-                },
-                new ProvisioningBlock());
+        final var credentialsProvider = new DynamicCredentialsProvider(null,
+                null,
+                null,
+                password,
+                SignalServiceAddress.DEFAULT_DEVICE_ID);
+        final var pushServiceSocket = new PushServiceSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
+                credentialsProvider,
+                userAgent,
+                ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+        final var provisioningSocket = new ProvisioningSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
+                userAgent);
+        this.provisioningApi = new ProvisioningApi(pushServiceSocket, provisioningSocket, credentialsProvider);
    }

    @Override
    public URI getDeviceLinkUri() throws TimeoutException, IOException {
-        try {
-            var url = urlFuture.get(30, TimeUnit.SECONDS);
-            return new URI(url);
-        } catch (java.util.concurrent.TimeoutException e) {
-            throw new TimeoutException("Timed out waiting for provisioning URL");
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new IOException("Interrupted while waiting for provisioning URL", e);
-        } catch (ExecutionException e) {
-            throw new IOException("Failed to get provisioning URL", e.getCause());
-        } catch (URISyntaxException e) {
-            throw new IOException("Invalid provisioning URL", e);
-        }
+        var deviceUuid = provisioningApi.getNewDeviceUuid();
+
+        return new DeviceLinkUrl(deviceUuid, tempIdentityKey.getPublicKey().getPublicKey()).createDeviceLinkUri();
    }

    @Override
    public String finishDeviceLink(String deviceName) throws IOException, TimeoutException, UserAlreadyExistsException {
-        SecondaryProvisioningCipher.ProvisioningDecryptResult<ProvisionMessage> decryptResult;
-        try {
-            decryptResult = messageFuture.get(120, TimeUnit.SECONDS);
-        } catch (java.util.concurrent.TimeoutException e) {
-            throw new TimeoutException("Timed out waiting for provisioning message");
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new IOException("Interrupted while waiting for provisioning message", e);
-        } catch (ExecutionException e) {
-            throw new IOException("Failed to receive provisioning message", e.getCause());
-        }
-
-        if (!(decryptResult instanceof SecondaryProvisioningCipher.ProvisioningDecryptResult.Success<ProvisionMessage> success)) {
-            throw new IOException("Failed to decrypt provisioning message");
-        }
-        var msg = success.getMessage();
-
-        var number = msg.number;
-        var aci = ACI.parseOrThrow(msg.aci, msg.aciBinary);
-        var pni = PNI.parseOrThrow(msg.pni, msg.pniBinary);
+        var ret = provisioningApi.getNewDeviceRegistration(tempIdentityKey);
+        var number = ret.getNumber();
+        var aci = ret.getAci();
+        var pni = ret.getPni();

        logger.info("Received link information from {}, linking in progress ...", number);

@ -167,42 +120,21 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
            accountsStore.updateAccount(accountPath, number, aci);
        }

-        final IdentityKeyPair aciIdentity;
-        final IdentityKeyPair pniIdentity;
-        final ProfileKey profileKey;
-        try {
-            aciIdentity = new IdentityKeyPair(new IdentityKey(msg.aciIdentityKeyPublic.toByteArray()),
-                    new ECPrivateKey(msg.aciIdentityKeyPrivate.toByteArray()));
-            pniIdentity = new IdentityKeyPair(new IdentityKey(msg.pniIdentityKeyPublic.toByteArray()),
-                    new ECPrivateKey(msg.pniIdentityKeyPrivate.toByteArray()));
-            profileKey = msg.profileKey == null
-                    ? KeyUtils.createProfileKey()
-                    : new ProfileKey(msg.profileKey.toByteArray());
-        } catch (Exception e) {
-            throw new IOException("Invalid key material in provisioning message", e);
-        }
-
        var encryptedDeviceName = deviceName == null
                ? null
-                : DeviceNameCipher.encryptDeviceName(deviceName.getBytes(StandardCharsets.UTF_8), aciIdentity);
-        var accountEntropyPool = msg.accountEntropyPool == null ? null : new AccountEntropyPool(msg.accountEntropyPool);
-        var mediaRootBackupKey = msg.mediaRootBackupKey == null
-                ? null
-                : new MediaRootBackupKey(msg.mediaRootBackupKey.toByteArray());
+                : DeviceNameUtil.encryptDeviceName(deviceName, ret.getAciIdentity().getPrivateKey());
+        // Create new account with the synced identity
+        var profileKey = ret.getProfileKey() == null ? KeyUtils.createProfileKey() : ret.getProfileKey();

        SignalAccount account = null;
-        var cleanUpPartialAccountOnFailure = false;
-        var linkingFinished = false;
        try {
            if (!accountExists) {
                account = SignalAccount.createLinkedAccount(pathConfig.dataPath(),
                        accountPath,
                        serviceEnvironmentConfig.type(),
                        Settings.DEFAULT);
-                cleanUpPartialAccountOnFailure = true;
            } else {
                account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, Settings.DEFAULT);
-                cleanUpPartialAccountOnFailure = false;
            }

            account.setProvisioningData(number,
@ -210,43 +142,24 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
                    pni,
                    password,
                    encryptedDeviceName,
-                    aciIdentity,
-                    pniIdentity,
+                    ret.getAciIdentity(),
+                    ret.getPniIdentity(),
                    profileKey,
-                    accountEntropyPool,
-                    msg.authCredentialSalt == null ? null : msg.authCredentialSalt.toByteArray(),
-                    mediaRootBackupKey);
+                    ret.getAccountEntropyPool(),
+                    ret.getMediaRootBackupKey());

-            if (msg.readReceipts != null) {
-                account.getConfigurationStore().setReadReceipts(msg.readReceipts);
-            }
+            account.getConfigurationStore().setReadReceipts(ret.isReadReceipts());

            final var aciPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.ACI));
            final var pniPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.PNI));

            logger.debug("Finishing new device registration");
-            final var attrs = account.getAccountAttributes(null);
-            final var deviceAttributes = new DeviceAttributes(attrs.getFetchesMessages(),
-                    attrs.getRegistrationId(),
-                    attrs.getPniRegistrationId(),
-                    attrs.getName(),
-                    attrs.getCapabilities());
-            final var unauthAccountManager = SignalServiceAccountManager.createWithStaticCredentials(
-                    serviceEnvironmentConfig.signalServiceConfiguration(),
-                    null,
-                    null,
-                    number,
-                    SignalServiceAddress.DEFAULT_DEVICE_ID,
-                    password,
-                    userAgent,
-                    ServiceConfig.AUTOMATIC_NETWORK_RETRY,
-                    ServiceConfig.GROUP_MAX_SIZE);
-            final var registerResponse = handleResponseException(unauthAccountManager.getRegistrationApi()
-                    .registerAsSecondaryDevice(msg.provisioningCode, deviceAttributes, aciPreKeys, pniPreKeys, null));
-            final var deviceId = Integer.parseInt(registerResponse.getDeviceId());
+            var deviceId = provisioningApi.finishNewDeviceRegistration(ret.getProvisioningCode(),
+                    account.getAccountAttributes(null),
+                    aciPreKeys,
+                    pniPreKeys);

            account.finishLinking(deviceId, aciPreKeys, pniPreKeys);
-            linkingFinished = true;

            ManagerImpl m = null;
            try {
@ -283,12 +196,6 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
                    m.close();
                }
            }
-        } catch (Exception e) {
-            if (!linkingFinished && cleanUpPartialAccountOnFailure && account != null) {
-                cleanupPartialAccount(account, accountPath, e);
-                account = null;
-            }
-            throw e;
        } finally {
            if (account != null) {
                account.close();
@ -296,33 +203,6 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
        }
    }

-    @Override
-    public void close() throws IOException {
-        socketHandle.close();
-    }
-
-    private void cleanupPartialAccount(final SignalAccount account, final String accountPath, final Exception cause) {
-        logger.warn("Link attempt failed before registration completed, removing partial account state for {}.",
-                accountPath,
-                cause);
-        try {
-            account.deleteAccountData();
-        } catch (IOException cleanupError) {
-            logger.warn("Failed to delete partial account data for {}: {}",
-                    accountPath,
-                    cleanupError.getMessage(),
-                    cleanupError);
-        }
-        try {
-            accountsStore.removeAccount(accountPath);
-        } catch (RuntimeException cleanupError) {
-            logger.warn("Failed to remove partial account entry for {}: {}",
-                    accountPath,
-                    cleanupError.getMessage(),
-                    cleanupError);
-        }
-    }
-
    private boolean canRelinkExistingAccount(final String accountPath) throws IOException {
        final SignalAccount signalAccount;
        try {
@ -336,10 +216,6 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
        }

        try (signalAccount) {
-            if (signalAccount.getDeviceId() <= 0) {
-                logger.debug("Account has invalid deviceId {}, allowing relink.", signalAccount.getDeviceId());
-                return true;
-            }
            if (signalAccount.isPrimaryDevice()) {
                logger.debug("Account is a primary device.");
                return false;
@ -367,36 +243,4 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
            return false;
        }
    }
-
-    private class ProvisioningBlock implements Function3<CoroutineScope, ProvisioningSocket<ProvisionMessage>, Continuation<? super Unit>, Object> {
-
-        @Override
-        public Object invoke(
-                CoroutineScope scope,
-                ProvisioningSocket<ProvisionMessage> socket,
-                Continuation<? super Unit> cont
-        ) {
-            Thread.ofVirtual().start(() -> {
-                try {
-                    urlFuture.complete(BuildersKt.runBlocking(EmptyCoroutineContext.INSTANCE,
-                            (s, c) -> socket.getProvisioningUrl(c)));
-                    messageFuture.complete(BuildersKt.runBlocking(EmptyCoroutineContext.INSTANCE,
-                            (s, c) -> socket.getProvisioningMessageDecryptResult(c)));
-                    cont.resumeWith(Unit.INSTANCE);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    failBoth(new RuntimeException(e), cont);
-                } catch (Throwable t) {
-                    failBoth(t, cont);
-                }
-            });
-            return IntrinsicsKt.getCOROUTINE_SUSPENDED();
-        }
-
-        private void failBoth(Throwable t, Continuation<? super Unit> cont) {
-            urlFuture.completeExceptionally(t);
-            messageFuture.completeExceptionally(t);
-            cont.resumeWith(ResultKt.createFailure(t));
-        }
-    }
 }
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@ -231,7 +231,6 @@ public class RegistrationManagerImpl implements RegistrationManager {
                    userAgent,
                    account.getCredentialsProvider(),
                    account.getSignalServiceDataStore(),
-                    0,
                    null,
                    new ReentrantSignalSessionLock());
            handleResponseException(dependencies.getAccountApi()
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@ -3,21 +3,9 @@ package org.asamk.signal.manager.internal;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.util.Utils;
-import org.signal.core.util.UptimeSleepTimer;
 import org.signal.libsignal.metadata.certificate.CertificateValidator;
 import org.signal.libsignal.net.Network;
-import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
-import org.signal.network.api.AttachmentApi;
-import org.signal.network.api.CallingApi;
-import org.signal.network.api.CdsApi;
-import org.signal.network.api.CertificateApi;
-import org.signal.network.api.LinkDeviceApi;
-import org.signal.network.api.RateLimitChallengeApi;
-import org.signal.network.api.UsernameApi;
-import org.signal.network.rest.SignalRestClient;
-import org.signal.network.service.CdnService;
-import org.signal.network.service.StorageServiceService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
@ -26,21 +14,29 @@ import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.SignalSessionLock;
 import org.whispersystems.signalservice.api.account.AccountApi;
+import org.whispersystems.signalservice.api.attachment.AttachmentApi;
+import org.whispersystems.signalservice.api.calling.CallingApi;
+import org.whispersystems.signalservice.api.cds.CdsApi;
+import org.whispersystems.signalservice.api.certificate.CertificateApi;
 import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.keys.KeysApi;
-import org.whispersystems.signalservice.api.keys.PreKeyRepository;
+import org.whispersystems.signalservice.api.link.LinkDeviceApi;
 import org.whispersystems.signalservice.api.message.MessageApi;
 import org.whispersystems.signalservice.api.profiles.ProfileApi;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.ratelimit.RateLimitChallengeApi;
 import org.whispersystems.signalservice.api.registration.RegistrationApi;
 import org.whispersystems.signalservice.api.services.ProfileService;
 import org.whispersystems.signalservice.api.storage.StorageServiceApi;
+import org.whispersystems.signalservice.api.storage.StorageServiceRepository;
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
+import org.whispersystems.signalservice.api.username.UsernameApi;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
+import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
 import org.whispersystems.signalservice.internal.push.PushServiceSocket;
 import org.whispersystems.signalservice.internal.websocket.LibSignalChatConnection;
@ -65,7 +61,6 @@ public class SignalDependencies {
    private final String userAgent;
    private final CredentialsProvider credentialsProvider;
    private final SignalServiceDataStore dataStore;
-    private final int deviceId;
    private final ExecutorService executor;
    private final SignalSessionLock sessionLock;

@ -87,11 +82,6 @@ public class SignalDependencies {
    private KeysApi keysApi;
    private GroupsV2Operations groupsV2Operations;
    private ClientZkOperations clientZkOperations;
-    private ProfileService profileService;
-    private ProfileApi profileApi;
-    private CdnService cdnService;
-    private PreKeyRepository preKeyRepository;
-    private SignalRestClient signalRestClient;

    private PushServiceSocket pushServiceSocket;
    private Network libSignalNetwork;
@ -101,13 +91,14 @@ public class SignalDependencies {
    private SignalServiceMessageSender messageSender;

    private List<SecureValueRecovery> secureValueRecovery;
+    private ProfileService profileService;
+    private ProfileApi profileApi;

    SignalDependencies(
            final ServiceEnvironmentConfig serviceEnvironmentConfig,
            final String userAgent,
            final CredentialsProvider credentialsProvider,
            final SignalServiceDataStore dataStore,
-            final int deviceId,
            final ExecutorService executor,
            final SignalSessionLock sessionLock
    ) {
@ -115,7 +106,6 @@ public class SignalDependencies {
        this.userAgent = userAgent;
        this.credentialsProvider = credentialsProvider;
        this.dataStore = dataStore;
-        this.deviceId = deviceId;
        this.executor = executor;
        this.sessionLock = sessionLock;
    }
@ -253,8 +243,8 @@ public class SignalDependencies {
                        getPushServiceSocket()));
    }

-    public StorageServiceService getStorageServiceRepository() {
-        return new StorageServiceService(getStorageServiceApi());
+    public StorageServiceRepository getStorageServiceRepository() {
+        return new StorageServiceRepository(getStorageServiceApi());
    }

    public CertificateApi getCertificateApi() {
@ -336,34 +326,12 @@ public class SignalDependencies {
                () -> messageReceiver = new SignalServiceMessageReceiver(getPushServiceSocket()));
    }

-    private SignalRestClient getSignalRestClient() {
-        return getOrCreate(() -> signalRestClient,
-                () -> signalRestClient = new SignalRestClient(serviceEnvironmentConfig.signalServiceConfiguration(),
-                        userAgent,
-                        credentialsProvider,
-                        ServiceConfig.AUTOMATIC_NETWORK_RETRY));
-    }
-
-    public CdnService getCdnService() {
-        return getOrCreate(() -> cdnService,
-                () -> cdnService = new CdnService(getSignalRestClient(), getAttachmentApi()));
-    }
-
-    public PreKeyRepository getPreKeyRepository() {
-        final SignalProtocolAddress localProtocolAddress = credentialsProvider.getAci().toProtocolAddress(deviceId);
-        return getOrCreate(() -> preKeyRepository,
-                () -> preKeyRepository = new PreKeyRepository(getKeysApi(),
-                        dataStore.aci(),
-                        localProtocolAddress,
-                        getSessionLock(),
-                        Runnable::run));
-    }
-
    public SignalServiceMessageSender getMessageSender() {
        return getOrCreate(() -> messageSender,
                () -> messageSender = new SignalServiceMessageSender(getPushServiceSocket(),
                        dataStore,
                        sessionLock,
+                        getAttachmentApi(),
                        getMessageApi(),
                        getKeysApi(),
                        Optional.empty(),
@ -371,7 +339,8 @@ public class SignalDependencies {
                        ServiceConfig.MAX_ENVELOPE_SIZE,
                        ServiceConfig.MAX_INCREMENTAL_MACS_PER_ENVELOPE,
                        () -> true,
-                        getPreKeyRepository()));
+                        true,
+                        true));
    }

    public List<SecureValueRecovery> getSecureValueRecovery() {
@ -399,10 +368,7 @@ public class SignalDependencies {

    public SignalServiceCipher getCipher(ServiceIdType serviceIdType) {
        final var certificateValidator = new CertificateValidator(serviceEnvironmentConfig.unidentifiedSenderTrustRoots());
-        final var serviceId = serviceIdType == ServiceIdType.ACI
-                ? credentialsProvider.getAci()
-                : credentialsProvider.getPni();
-        final var address = new SignalServiceAddress(serviceId, credentialsProvider.getE164());
+        final var address = new SignalServiceAddress(credentialsProvider.getAci(), credentialsProvider.getE164());
        final var deviceId = credentialsProvider.getDeviceId();
        return new SignalServiceCipher(address,
                deviceId,
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
@ -1,15 +1,13 @@
 package org.asamk.signal.manager.internal;

-import org.jetbrains.annotations.NotNull;
-import org.signal.core.util.SleepTimer;
-import org.signal.network.util.Preconditions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.util.Preconditions;
+import org.whispersystems.signalservice.api.util.SleepTimer;
 import org.whispersystems.signalservice.api.websocket.HealthMonitor;
 import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;

-import java.time.Duration;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@ -96,26 +94,6 @@ final class SignalWebSocketHealthMonitor implements HealthMonitor {
        return needsKeepAlive && webSocket != null && webSocket.shouldSendKeepAlives();
    }

-    @Override
-    public void onReceivedAlerts(@NotNull final String[] strings, final boolean b) {
-        if (strings.length == 0) {
-            return;
-        }
-        logger.info("Received alerts: {}", String.join(", ", strings));
-    }
-
-    @Override
-    public void onServerTimestamp(final long serverTimestamp, final boolean isIdentifiedWebsocket) {
-        final var skew = skewFrom(serverTimestamp);
-        if (skew.compareTo(Duration.ofDays(1)) > 0) {
-            logger.warn("Local clock is off from the server by {}, which exceeds the allowed limit..", skew);
-        }
-    }
-
-    private Duration skewFrom(long serverTime) {
-        return Duration.ofMillis(Math.abs(System.currentTimeMillis() - serverTime));
-    }
-
    /**
     * Sends periodic heartbeats/keep-alives over the WebSocket to prevent connection timeouts. If
     * the WebSocket fails to get a return heartbeat after [KEEP_ALIVE_TIMEOUT] seconds, it is forced to be recreated.
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@ -33,7 +33,7 @@ import java.util.UUID;
 public class AccountDatabase extends Database {

    private static final Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 31;
+    private static final long DATABASE_VERSION = 28;

    private AccountDatabase(final HikariDataSource dataSource) {
        super(logger, DATABASE_VERSION, dataSource);
@ -623,36 +623,6 @@ public class AccountDatabase extends Database {
                                        """);
            }
        }
-        if (oldVersion < 29) {
-            logger.debug("Updating database: Adding sticker storage sync columns");
-            try (final var statement = connection.createStatement()) {
-                statement.executeUpdate("""
-                                        ALTER TABLE sticker ADD COLUMN position INTEGER NOT NULL DEFAULT 0;
-                                        ALTER TABLE sticker ADD COLUMN deleted_timestamp INTEGER NOT NULL DEFAULT 0;
-                                        ALTER TABLE sticker ADD COLUMN storage_id BLOB;
-                                        ALTER TABLE sticker ADD COLUMN storage_record BLOB;
-                                        CREATE UNIQUE INDEX sticker_storage_id_index ON sticker (storage_id);
-                                        """);
-            }
-        }
-        if (oldVersion < 30) {
-            logger.debug("Updating database: Create pni_signature_verified column");
-            try (final var statement = connection.createStatement()) {
-                statement.executeUpdate("""
-                                        ALTER TABLE recipient ADD pni_signature_verified INTEGER NOT NULL DEFAULT FALSE;
-                                        """);
-            }
-        }
-        if (oldVersion < 31) {
-            logger.debug("Updating database: Add blocked-at timestamps");
-            try (final var statement = connection.createStatement()) {
-                statement.executeUpdate("""
-                                        ALTER TABLE recipient ADD blocked_at INTEGER NOT NULL DEFAULT 0;
-                                        ALTER TABLE group_v1 ADD blocked_at INTEGER NOT NULL DEFAULT 0;
-                                        ALTER TABLE group_v2 ADD blocked_at INTEGER NOT NULL DEFAULT 0;
-                                        """);
-            }
-        }
    }

    private static void createUuidMappingTable(
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java
@ -44,8 +44,7 @@ public class AttachmentStore {
    }

    public StreamDetails retrieveAttachment(final String id) throws IOException {
-        final var safeId = sanitizeId(id);
-        final var attachmentFile = new File(attachmentsPath, safeId);
+        final var attachmentFile = new File(attachmentsPath, id);
        return Utils.createStreamDetailsFromFile(attachmentFile);
    }

@ -62,8 +61,7 @@ public class AttachmentStore {
            Optional<String> contentType
    ) {
        final var extension = getAttachmentExtension(filename, contentType);
-        final var safe = sanitizeId(attachmentId.toString());
-        return new File(attachmentsPath, safe + extension + ".preview");
+        return new File(attachmentsPath, attachmentId.toString() + extension + ".preview");
    }

    private File getAttachmentFile(
@ -72,15 +70,7 @@ public class AttachmentStore {
            Optional<String> contentType
    ) {
        final var extension = getAttachmentExtension(filename, contentType);
-        final var safe = sanitizeId(attachmentId.toString());
-        return new File(attachmentsPath, safe + extension);
-    }
-
-    private static String sanitizeId(final String id) {
-        if (id == null) {
-            return "";
-        }
-        return id.replaceAll("[^A-Za-z0-9_.-]", "_");
+        return new File(attachmentsPath, attachmentId.toString() + extension);
    }

    private static String getAttachmentExtension(final Optional<String> filename, final Optional<String> contentType) {
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@ -116,7 +116,7 @@ public class SignalAccount implements Closeable {
    private static final Logger logger = LoggerFactory.getLogger(SignalAccount.class);

    private static final int MINIMUM_STORAGE_VERSION = 1;
-    private static final int CURRENT_STORAGE_VERSION = 11;
+    private static final int CURRENT_STORAGE_VERSION = 10;

    private final Object LOCK = new Object();

@ -141,7 +141,6 @@ public class SignalAccount implements Closeable {
    private MasterKey pinMasterKey;
    private StorageKey storageKey;
    private AccountEntropyPool accountEntropyPool;
-    private byte[] authCredentialSalt;
    private MediaRootBackupKey mediaRootBackupKey;
    private ProfileKey profileKey;

@ -154,10 +153,6 @@ public class SignalAccount implements Closeable {
    private final KeyValueEntry<Long> lastReceiveTimestamp = new KeyValueEntry<>("last-receive-timestamp",
            long.class,
            0L);
-    private final KeyValueEntry<Long> lastAppliedPniChangeServerTimestamp = new KeyValueEntry<>(
-            "last-applied-pni-change-server-timestamp",
-            long.class,
-            0L);
    private final KeyValueEntry<Boolean> needsToRetryFailedMessages = new KeyValueEntry<>("retry-failed-messages",
            Boolean.class,
            true);
@ -197,10 +192,6 @@ public class SignalAccount implements Closeable {
        this.lock = lock;
    }

-    public File getDataPath() {
-        return dataPath;
-    }
-
    public static SignalAccount load(
            File dataPath,
            String accountPath,
@ -297,12 +288,11 @@ public class SignalAccount implements Closeable {
            final ACI aci,
            final PNI pni,
            final String password,
-            final byte[] encryptedDeviceName,
+            final String encryptedDeviceName,
            final IdentityKeyPair aciIdentity,
            final IdentityKeyPair pniIdentity,
            final ProfileKey profileKey,
            final AccountEntropyPool accountEntropyPool,
-            final byte[] authCredentialSalt,
            final MediaRootBackupKey mediaRootBackupKey
    ) {
        this.deviceId = 0;
@ -313,13 +303,12 @@ public class SignalAccount implements Closeable {
        getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
        this.password = password;
        this.profileKey = profileKey;
-        this.encryptedDeviceName = org.signal.core.util.Base64.encodeWithoutPadding(encryptedDeviceName);
+        this.encryptedDeviceName = encryptedDeviceName;
        this.aciAccountData.setIdentityKeyPair(aciIdentity);
        this.pniAccountData.setIdentityKeyPair(pniIdentity);
        this.registered = false;
        this.isMultiDevice = true;
        setLastReceiveTimestamp(0L);
-        setLastAppliedPniChangeServerTimestamp(0L);
        if (accountEntropyPool != null) {
            this.pinMasterKey = null;
            this.accountEntropyPool = accountEntropyPool;
@ -327,7 +316,6 @@ public class SignalAccount implements Closeable {
            this.pinMasterKey = null;
            this.accountEntropyPool = null;
        }
-        this.authCredentialSalt = authCredentialSalt;
        this.mediaRootBackupKey = mediaRootBackupKey;
        getKeyValueStore().storeEntry(storageManifestVersion, -1L);
        this.setStorageManifest(null);
@ -364,7 +352,6 @@ public class SignalAccount implements Closeable {
    ) {
        this.pinMasterKey = masterKey;
        this.accountEntropyPool = null;
-        this.authCredentialSalt = null;
        getKeyValueStore().storeEntry(storageManifestVersion, -1L);
        this.setStorageManifest(null);
        this.storageKey = null;
@ -377,7 +364,6 @@ public class SignalAccount implements Closeable {
        init();
        this.registrationLockPin = pin;
        setLastReceiveTimestamp(0L);
-        setLastAppliedPniChangeServerTimestamp(0L);
        save();

        setPreKeys(ServiceIdType.ACI, aciPreKeys);
@ -530,9 +516,6 @@ public class SignalAccount implements Closeable {
            if (storage.accountEntropyPool != null) {
                accountEntropyPool = new AccountEntropyPool(storage.accountEntropyPool);
            }
-            if (storage.authCredentialSalt != null) {
-                authCredentialSalt = base64.decode(storage.authCredentialSalt);
-            }
            if (storage.mediaRootBackupKey != null) {
                mediaRootBackupKey = new MediaRootBackupKey(base64.decode(storage.mediaRootBackupKey));
            }
@ -913,7 +896,6 @@ public class SignalAccount implements Closeable {
                                0,
                                false,
                                contact.blocked,
-                                0,
                                contact.archived,
                                false,
                                false,
@ -1022,7 +1004,6 @@ public class SignalAccount implements Closeable {
                    pinMasterKey == null ? null : base64.encodeToString(pinMasterKey.serialize()),
                    storageKey == null ? null : base64.encodeToString(storageKey.serialize()),
                    accountEntropyPool == null ? null : accountEntropyPool.getValue(),
-                    authCredentialSalt == null ? null : base64.encodeToString(authCredentialSalt),
                    mediaRootBackupKey == null ? null : base64.encodeToString(mediaRootBackupKey.getValue()),
                    profileKey == null ? null : base64.encodeToString(profileKey.serialize()),
                    usernameLink == null ? null : base64.encodeToString(usernameLink.getEntropy()),
@ -1237,11 +1218,6 @@ public class SignalAccount implements Closeable {
                return pniAccountData.getSignalServiceAccountDataStore();
            }

-            @Override
-            public SignalServiceAccountDataStore pniOrNull() {
-                return getPni() != null ? pniAccountData.getSignalServiceAccountDataStore() : null;
-            }
-
            @Override
            public boolean isMultiDevice() {
                return SignalAccount.this.isMultiDevice();
@ -1662,10 +1638,6 @@ public class SignalAccount implements Closeable {
        save();
    }

-    public byte[] getAuthCredentialSalt() {
-        return authCredentialSalt;
-    }
-
    public String getRecoveryPassword() {
        final var masterKey = getPinBackedMasterKey();
        if (masterKey == null) {
@ -1749,7 +1721,7 @@ public class SignalAccount implements Closeable {
    }

    public boolean isRegistered() {
-        return registered && deviceId > 0;
+        return registered;
    }

    public void setRegistered(final boolean registered) {
@ -1777,14 +1749,6 @@ public class SignalAccount implements Closeable {
        getKeyValueStore().storeEntry(lastReceiveTimestamp, value);
    }

-    public long getLastAppliedPniChangeServerTimestamp() {
-        return getKeyValueStore().getEntry(lastAppliedPniChangeServerTimestamp);
-    }
-
-    public void setLastAppliedPniChangeServerTimestamp(final long value) {
-        getKeyValueStore().storeEntry(lastAppliedPniChangeServerTimestamp, value);
-    }
-
    public void setNeedsToRetryFailedMessages(final boolean value) {
        getKeyValueStore().storeEntry(needsToRetryFailedMessages, value);
    }
@ -1956,8 +1920,7 @@ public class SignalAccount implements Closeable {
                            getSessionStore(),
                            getIdentityKeyStore(),
                            getSenderKeyStore(),
-                            SignalAccount.this::isMultiDevice,
-                            SignalAccount.this::setMultiDevice));
+                            SignalAccount.this::isMultiDevice));
        }

        public PreKeyStore getPreKeyStore() {
@ -2005,7 +1968,6 @@ public class SignalAccount implements Closeable {
            String pinMasterKey,
            String storageKey,
            String accountEntropyPool,
-            String authCredentialSalt,
            String mediaRootBackupKey,
            String profileKey,
            String usernameLinkEntropy,
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
@ -58,10 +58,6 @@ public sealed abstract class GroupInfo permits GroupInfoV1, GroupInfoV2 {

    public abstract void setBlocked(boolean blocked);

-    public abstract long getBlockedAt();
-
-    public abstract void setBlockedAt(long blockedAt);
-
    public abstract boolean isProfileSharingEnabled();

    public abstract void setProfileSharingEnabled(boolean profileSharingEnabled);
@ -70,8 +66,6 @@ public sealed abstract class GroupInfo permits GroupInfoV1, GroupInfoV2 {

    public abstract boolean isAnnouncementGroup();

-    public abstract boolean isTerminated();
-
    public abstract GroupPermission getPermissionAddMember();

    public abstract GroupPermission getPermissionEditDetails();
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
@ -24,7 +24,6 @@ public final class GroupInfoV1 extends GroupInfo {
    public String color;
    public int messageExpirationTime;
    public boolean blocked;
-    private long blockedAt;
    public boolean archived;
    private byte[] storageRecord;

@ -40,7 +39,6 @@ public final class GroupInfoV1 extends GroupInfo {
            final String color,
            final int messageExpirationTime,
            final boolean blocked,
-            final long blockedAt,
            final boolean archived,
            final byte[] storageRecord
    ) {
@ -51,7 +49,6 @@ public final class GroupInfoV1 extends GroupInfo {
        this.color = color;
        this.messageExpirationTime = messageExpirationTime;
        this.blocked = blocked;
-        this.blockedAt = blockedAt;
        this.archived = archived;
        this.storageRecord = storageRecord;
    }
@ -94,24 +91,9 @@ public final class GroupInfoV1 extends GroupInfo {

    @Override
    public void setBlocked(final boolean blocked) {
-        if (blocked && !this.blocked) {
-            blockedAt = System.currentTimeMillis();
-        } else if (!blocked) {
-            blockedAt = 0;
-        }
        this.blocked = blocked;
    }

-    @Override
-    public long getBlockedAt() {
-        return blockedAt;
-    }
-
-    @Override
-    public void setBlockedAt(final long blockedAt) {
-        this.blockedAt = blockedAt;
-    }
-
    @Override
    public boolean isProfileSharingEnabled() {
        return true;
@ -131,11 +113,6 @@ public final class GroupInfoV1 extends GroupInfo {
        return false;
    }

-    @Override
-    public boolean isTerminated() {
-        return false;
-    }
-
    @Override
    public GroupPermission getPermissionAddMember() {
        return GroupPermission.EVERY_MEMBER;
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
@ -23,7 +23,6 @@ public final class GroupInfoV2 extends GroupInfo {
    private final GroupMasterKey masterKey;
    private final DistributionId distributionId;
    private boolean blocked;
-    private long blockedAt;
    private boolean profileSharingEnabled;
    private DecryptedGroup group;
    private byte[] storageRecord;
@ -48,7 +47,6 @@ public final class GroupInfoV2 extends GroupInfo {
            final DecryptedGroup group,
            final DistributionId distributionId,
            final boolean blocked,
-            final long blockedAt,
            final boolean profileSharingEnabled,
            final boolean permissionDenied,
            final byte[] storageRecord,
@ -59,7 +57,6 @@ public final class GroupInfoV2 extends GroupInfo {
        this.group = group;
        this.distributionId = distributionId;
        this.blocked = blocked;
-        this.blockedAt = blockedAt;
        this.profileSharingEnabled = profileSharingEnabled;
        this.permissionDenied = permissionDenied;
        this.storageRecord = storageRecord;
@ -189,24 +186,9 @@ public final class GroupInfoV2 extends GroupInfo {

    @Override
    public void setBlocked(final boolean blocked) {
-        if (blocked && !this.blocked) {
-            blockedAt = System.currentTimeMillis();
-        } else if (!blocked) {
-            blockedAt = 0;
-        }
        this.blocked = blocked;
    }

-    @Override
-    public long getBlockedAt() {
-        return blockedAt;
-    }
-
-    @Override
-    public void setBlockedAt(final long blockedAt) {
-        this.blockedAt = blockedAt;
-    }
-
    @Override
    public boolean isProfileSharingEnabled() {
        return profileSharingEnabled;
@ -229,11 +211,6 @@ public final class GroupInfoV2 extends GroupInfo {
        return this.group != null && this.group.isAnnouncementGroup == EnabledState.ENABLED;
    }

-    @Override
-    public boolean isTerminated() {
-        return this.group != null && Boolean.TRUE.equals(this.group.terminated);
-    }
-
    @Override
    public GroupPermission getPermissionAddMember() {
        final var accessControl = getAccessControl();
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@ -63,7 +63,6 @@ public class GroupStore {
                                      distribution_id BLOB UNIQUE NOT NULL,
                                      endorsement_expiration_time INTEGER NOT NULL DEFAULT 0,
                                      blocked INTEGER NOT NULL DEFAULT FALSE,
-                                      blocked_at INTEGER NOT NULL DEFAULT 0,
                                      profile_sharing INTEGER NOT NULL DEFAULT FALSE,
                                      permission_denied INTEGER NOT NULL DEFAULT FALSE
                                    ) STRICT;
@ -84,7 +83,6 @@ public class GroupStore {
                                      color TEXT,
                                      expiration_time INTEGER NOT NULL DEFAULT 0,
                                      blocked INTEGER NOT NULL DEFAULT FALSE,
-                                      blocked_at INTEGER NOT NULL DEFAULT 0,
                                      archived INTEGER NOT NULL DEFAULT FALSE
                                    ) STRICT;
                                    CREATE TABLE group_v1_member (
@ -403,7 +401,6 @@ public class GroupStore {
                deleteGroup(connection, groupInfoV1.getGroupId());
                final var groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey, recipientResolver);
                groupInfoV2.setBlocked(groupInfoV1.isBlocked());
-                groupInfoV2.setBlockedAt(groupInfoV1.getBlockedAt());
                updateGroup(connection, groupInfoV2);
                logger.debug("Locally migrated group {} to group v2, id: {}",
                        groupInfoV1.getGroupId().toBase64(),
@ -617,9 +614,9 @@ public class GroupStore {
                }
            }
            final var sql = """
-                            INSERT INTO %s (_id, group_id, group_id_v2, name, color, expiration_time, blocked, blocked_at, archived, storage_id)
-                            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-                            ON CONFLICT (_id) DO UPDATE SET group_id=excluded.group_id, group_id_v2=excluded.group_id_v2, name=excluded.name, color=excluded.color, expiration_time=excluded.expiration_time, blocked=excluded.blocked, blocked_at=excluded.blocked_at, archived=excluded.archived, storage_id=excluded.storage_id
+                            INSERT INTO %s (_id, group_id, group_id_v2, name, color, expiration_time, blocked, archived, storage_id)
+                            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+                            ON CONFLICT (_id) DO UPDATE SET group_id=excluded.group_id, group_id_v2=excluded.group_id_v2, name=excluded.name, color=excluded.color, expiration_time=excluded.expiration_time, blocked=excluded.blocked, archived=excluded.archived, storage_id=excluded.storage_id
                            RETURNING _id
                            """.formatted(TABLE_GROUP_V1);
            try (final var statement = connection.prepareStatement(sql)) {
@ -634,9 +631,8 @@ public class GroupStore {
                statement.setString(5, groupV1.color);
                statement.setLong(6, groupV1.getMessageExpirationTimer());
                statement.setBoolean(7, groupV1.isBlocked());
-                statement.setLong(8, groupV1.getBlockedAt());
-                statement.setBoolean(9, groupV1.archived);
-                statement.setBytes(10, KeyUtils.createRawStorageId());
+                statement.setBoolean(8, groupV1.archived);
+                statement.setBytes(9, KeyUtils.createRawStorageId());
                final var generatedKey = Utils.executeQueryForOptional(statement, Utils::getIdMapper);

                if (internalId == null) {
@ -662,9 +658,9 @@ public class GroupStore {
        } else if (group instanceof GroupInfoV2 groupV2) {
            final var sql = (
                    """
-                    INSERT INTO %s (_id, group_id, master_key, group_data, distribution_id, blocked, blocked_at, permission_denied, storage_id, profile_sharing)
-                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-                    ON CONFLICT (_id) DO UPDATE SET group_id=excluded.group_id, master_key=excluded.master_key, group_data=excluded.group_data, distribution_id=excluded.distribution_id, blocked=excluded.blocked, blocked_at=excluded.blocked_at, permission_denied=excluded.permission_denied, storage_id=excluded.storage_id, profile_sharing=excluded.profile_sharing
+                    INSERT INTO %s (_id, group_id, master_key, group_data, distribution_id, blocked, permission_denied, storage_id, profile_sharing)
+                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+                    ON CONFLICT (_id) DO UPDATE SET group_id=excluded.group_id, master_key=excluded.master_key, group_data=excluded.group_data, distribution_id=excluded.distribution_id, blocked=excluded.blocked, permission_denied=excluded.permission_denied, storage_id=excluded.storage_id, profile_sharing=excluded.profile_sharing
                    """
            ).formatted(TABLE_GROUP_V2);
            try (final var statement = connection.prepareStatement(sql)) {
@ -682,10 +678,9 @@ public class GroupStore {
                }
                statement.setBytes(5, UuidUtil.toByteArray(groupV2.getDistributionId().asUuid()));
                statement.setBoolean(6, groupV2.isBlocked());
-                statement.setLong(7, groupV2.getBlockedAt());
-                statement.setBoolean(8, groupV2.isPermissionDenied());
-                statement.setBytes(9, KeyUtils.createRawStorageId());
-                statement.setBoolean(10, groupV2.isProfileSharingEnabled());
+                statement.setBoolean(7, groupV2.isPermissionDenied());
+                statement.setBytes(8, KeyUtils.createRawStorageId());
+                statement.setBoolean(9, groupV2.isProfileSharingEnabled());
                statement.executeUpdate();
            }
        } else {
@ -696,7 +691,7 @@ public class GroupStore {
    private List<GroupInfoV2> getGroupsV2() {
        final var sql = (
                """
-                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.blocked_at, g.profile_sharing, g.permission_denied, g.storage_record
+                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.profile_sharing, g.permission_denied, g.storage_record
                FROM %s g
                """
        ).formatted(TABLE_GROUP_V2);
@ -714,7 +709,7 @@ public class GroupStore {
    public GroupInfoV2 getGroup(Connection connection, GroupIdV2 groupIdV2) throws SQLException {
        final var sql = (
                """
-                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.blocked_at, g.profile_sharing, g.permission_denied, g.storage_record
+                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.profile_sharing, g.permission_denied, g.storage_record
                FROM %s g
                WHERE g.group_id = ?
                """
@ -748,7 +743,7 @@ public class GroupStore {
    public GroupInfoV2 getGroupV2(Connection connection, StorageId storageId) throws SQLException {
        final var sql = (
                """
-                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.blocked_at, g.profile_sharing, g.permission_denied, g.storage_record
+                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.profile_sharing, g.permission_denied, g.storage_record
                FROM %s g
                WHERE g.storage_id = ?
                """
@ -771,7 +766,6 @@ public class GroupStore {
            final var groupData = resultSet.getBytes("group_data");
            final var distributionId = resultSet.getBytes("distribution_id");
            final var blocked = resultSet.getBoolean("blocked");
-            final var blockedAt = resultSet.getLong("blocked_at");
            final var profileSharingEnabled = resultSet.getBoolean("profile_sharing");
            final var permissionDenied = resultSet.getBoolean("permission_denied");
            final var storageRecord = resultSet.getBytes("storage_record");
@ -780,7 +774,6 @@ public class GroupStore {
                    groupData == null ? null : DecryptedGroup.ADAPTER.decode(groupData),
                    DistributionId.from(UuidUtil.parseOrThrow(distributionId)),
                    blocked,
-                    blockedAt,
                    profileSharingEnabled,
                    permissionDenied,
                    storageRecord,
@ -807,7 +800,7 @@ public class GroupStore {
    private List<GroupInfoV1> getGroupsV1() {
        final var sql = (
                """
-                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.blocked_at, g.archived, g.storage_record
+                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived, g.storage_record
                FROM %s g
                """
        ).formatted(TABLE_GROUP_V1_MEMBER, TABLE_GROUP_V1);
@ -825,7 +818,7 @@ public class GroupStore {
    public GroupInfoV1 getGroup(Connection connection, GroupIdV1 groupIdV1) throws SQLException {
        final var sql = (
                """
-                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.blocked_at, g.archived, g.storage_record
+                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived, g.storage_record
                FROM %s g
                WHERE g.group_id = ?
                """
@ -859,7 +852,7 @@ public class GroupStore {
    public GroupInfoV1 getGroupV1(Connection connection, StorageId storageId) throws SQLException {
        final var sql = (
                """
-                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.blocked_at, g.archived, g.storage_record
+                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived, g.storage_record
                FROM %s g
                WHERE g.storage_id = ?
                """
@ -889,7 +882,6 @@ public class GroupStore {
                  .collect(Collectors.toSet());
        final var expirationTime = resultSet.getInt("expiration_time");
        final var blocked = resultSet.getBoolean("blocked");
-        final var blockedAt = resultSet.getLong("blocked_at");
        final var archived = resultSet.getBoolean("archived");
        final var storageRecord = resultSet.getBytes("storage_record");
        return new GroupInfoV1(GroupId.v1(groupId),
@ -899,7 +891,6 @@ public class GroupStore {
                color,
                expirationTime,
                blocked,
-                blockedAt,
                archived,
                storageRecord);
    }
@ -911,7 +902,7 @@ public class GroupStore {
    private GroupInfoV1 getGroupV1ByV2Id(Connection connection, GroupIdV2 groupIdV2) throws SQLException {
        final var sql = (
                """
-                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.blocked_at, g.archived, g.storage_record
+                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived, g.storage_record
                FROM %s g
                WHERE g.group_id_v2 = ?
                """
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
@ -59,7 +59,6 @@ public class LegacyGroupStore {
                        g1.color,
                        g1.messageExpirationTime,
                        g1.blocked,
-                        0,
                        g1.archived,
                        null);
            }
@ -78,7 +77,6 @@ public class LegacyGroupStore {
                    loadDecryptedGroupLocked(groupId, groupCachePath),
                    g2.distributionId == null ? DistributionId.create() : DistributionId.from(g2.distributionId),
                    g2.blocked,
-                    0,
                    true,
                    g2.permissionDenied,
                    null,
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
@ -26,7 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.function.Consumer;
 import java.util.function.Supplier;

 public class SignalProtocolStore implements SignalServiceAccountDataStore {
@ -38,7 +37,6 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
    private final IdentityKeyStore identityKeyStore;
    private final SignalServiceSenderKeyStore senderKeyStore;
    private final Supplier<Boolean> isMultiDevice;
-    private final Consumer<Boolean> setMultiDeviceCallback;

    public SignalProtocolStore(
            final SignalServicePreKeyStore preKeyStore,
@ -47,8 +45,7 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
            final SignalServiceSessionStore sessionStore,
            final IdentityKeyStore identityKeyStore,
            final SignalServiceSenderKeyStore senderKeyStore,
-            final Supplier<Boolean> isMultiDevice,
-            final Consumer<Boolean> setMultiDeviceCallback
+            final Supplier<Boolean> isMultiDevice
    ) {
        this.preKeyStore = preKeyStore;
        this.signedPreKeyStore = signedPreKeyStore;
@ -57,7 +54,6 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
        this.identityKeyStore = identityKeyStore;
        this.senderKeyStore = senderKeyStore;
        this.isMultiDevice = isMultiDevice;
-        this.setMultiDeviceCallback = setMultiDeviceCallback;
    }

    @Override
@ -213,11 +209,6 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
        return isMultiDevice.get();
    }

-    @Override
-    public void setMultiDevice(final boolean isMultiDevice) {
-        setMultiDeviceCallback.accept(isMultiDevice);
-    }
-
    @Override
    public KyberPreKeyRecord loadKyberPreKey(final int kyberPreKeyId) throws InvalidKeyIdException {
        return kyberPreKeyStore.loadKyberPreKey(kyberPreKeyId);
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
@ -50,7 +50,6 @@ public class LegacyRecipientStore2 {
                            0,
                            false,
                            r.contact.blocked,
-                            0,
                            r.contact.archived,
                            r.contact.profileSharingEnabled,
                            false,
@ -101,7 +100,6 @@ public class LegacyRecipientStore2 {
                        profile,
                        null,
                        null,
-                        false,
                        null);
            }).collect(Collectors.toMap(Recipient::getRecipientId, r -> r));

--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
@ -25,8 +25,6 @@ public class Recipient {

    private final Long unregisteredTimestamp;

-    private final boolean pniSignatureVerified;
-
    private final byte[] storageRecord;

    public Recipient(
@ -38,7 +36,6 @@ public class Recipient {
            final Profile profile,
            final Boolean discoverable,
            final Long unregisteredTimestamp,
-            final boolean pniSignatureVerified,
            final byte[] storageRecord
    ) {
        this.recipientId = recipientId;
@ -49,7 +46,6 @@ public class Recipient {
        this.profile = profile;
        this.discoverable = discoverable;
        this.unregisteredTimestamp = unregisteredTimestamp;
-        this.pniSignatureVerified = pniSignatureVerified;
        this.storageRecord = storageRecord;
    }

@ -62,7 +58,6 @@ public class Recipient {
        profile = builder.profile;
        discoverable = builder.discoverable;
        unregisteredTimestamp = builder.unregisteredTimestamp;
-        pniSignatureVerified = builder.pniSignatureVerified;
        storageRecord = builder.storageRecord;
    }

@ -78,9 +73,6 @@ public class Recipient {
        builder.profileKey = copy.getProfileKey();
        builder.expiringProfileKeyCredential = copy.getExpiringProfileKeyCredential();
        builder.profile = copy.getProfile();
-        builder.discoverable = copy.getDiscoverable();
-        builder.unregisteredTimestamp = copy.getUnregisteredTimestamp();
-        builder.pniSignatureVerified = copy.isPniSignatureVerified();
        builder.storageRecord = copy.getStorageRecord();
        return builder;
    }
@ -121,10 +113,6 @@ public class Recipient {
        return unregisteredTimestamp == null;
    }

-    public boolean isPniSignatureVerified() {
-        return pniSignatureVerified;
-    }
-
    public byte[] getStorageRecord() {
        return storageRecord;
    }
@ -139,19 +127,12 @@ public class Recipient {
                && Objects.equals(contact, recipient.contact)
                && Objects.equals(profileKey, recipient.profileKey)
                && Objects.equals(expiringProfileKeyCredential, recipient.expiringProfileKeyCredential)
-                && Objects.equals(profile, recipient.profile)
-                && pniSignatureVerified == recipient.pniSignatureVerified;
+                && Objects.equals(profile, recipient.profile);
    }

    @Override
    public int hashCode() {
-        return Objects.hash(recipientId,
-                address,
-                contact,
-                profileKey,
-                expiringProfileKeyCredential,
-                profile,
-                pniSignatureVerified);
+        return Objects.hash(recipientId, address, contact, profileKey, expiringProfileKeyCredential, profile);
    }

    public static final class Builder {
@ -164,7 +145,6 @@ public class Recipient {
        private Profile profile;
        private Boolean discoverable;
        private Long unregisteredTimestamp;
-        private boolean pniSignatureVerified;
        private byte[] storageRecord;

        private Builder() {
@ -210,11 +190,6 @@ public class Recipient {
            return this;
        }

-        public Builder withPniSignatureVerified(final boolean val) {
-            pniSignatureVerified = val;
-            return this;
-        }
-
        public Builder withStorageRecord(final byte[] val) {
            storageRecord = val;
            return this;
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@ -30,7 +30,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@ -52,18 +51,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re

    private final Map<Long, Long> recipientsMerged = new HashMap<>();

-    private static final int MAX_RECIPIENT_CACHE_SIZE = 2000;
-
-    private final Map<ServiceId, RecipientWithAddress> recipientAddressCache = Collections.synchronizedMap(new LinkedHashMap<>(
-            16,
-            0.75f,
-            true) {
-
-        @Override
-        protected boolean removeEldestEntry(Map.Entry<ServiceId, RecipientWithAddress> eldest) {
-            return size() > MAX_RECIPIENT_CACHE_SIZE;
-        }
-    });
+    private final Map<ServiceId, RecipientWithAddress> recipientAddressCache = Collections.synchronizedMap(new HashMap<>());

    public static void createSql(Connection connection) throws SQLException {
        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
@ -82,7 +70,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                      profile_key BLOB,
                                      profile_key_credential BLOB,
                                      needs_pni_signature INTEGER NOT NULL DEFAULT FALSE,
-                                      pni_signature_verified INTEGER NOT NULL DEFAULT FALSE,
                                    
                                      given_name TEXT,
                                      family_name TEXT,
@ -96,7 +83,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                      expiration_time_version INTEGER DEFAULT 1 NOT NULL,
                                      mute_until INTEGER NOT NULL DEFAULT 0,
                                      blocked INTEGER NOT NULL DEFAULT FALSE,
-                                      blocked_at INTEGER NOT NULL DEFAULT 0,
                                      archived INTEGER NOT NULL DEFAULT FALSE,
                                      profile_sharing INTEGER NOT NULL DEFAULT FALSE,
                                      hide_story INTEGER NOT NULL DEFAULT FALSE,
@ -352,7 +338,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
    public List<Pair<RecipientId, Contact>> getContacts() {
        final var sql = (
                """
-                SELECT r._id, r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.blocked_at, r.archived, r.hidden, r.unregistered_timestamp
+                SELECT r._id, r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
                FROM %s r
                WHERE (r.number IS NOT NULL OR r.pni IS NOT NULL OR r.aci IS NOT NULL) AND %s AND r.hidden = FALSE
                """
@ -376,8 +362,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                SELECT r._id,
                       r.number, r.aci, r.pni, r.username,
                       r.profile_key, r.profile_key_credential,
-                       r.pni_signature_verified,
-                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.blocked_at, r.archived, r.hidden, r.unregistered_timestamp,
+                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
                       r.discoverable,
                       r.storage_record
@ -397,8 +382,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                SELECT r._id,
                       r.number, r.aci, r.pni, r.username,
                       r.profile_key, r.profile_key_credential,
-                       r.pni_signature_verified,
-                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.blocked_at, r.archived, r.hidden, r.unregistered_timestamp,
+                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
                       r.discoverable,
                       r.storage_record
@ -447,8 +431,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                SELECT r._id,
                       r.number, r.aci, r.pni, r.username,
                       r.profile_key, r.profile_key_credential,
-                       r.pni_signature_verified,
-                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.blocked_at, r.archived, r.hidden, r.unregistered_timestamp,
+                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
                       r.discoverable,
                       r.storage_record
@ -480,40 +463,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
        }
    }

-    /**
-     * Returns the subset of the given recipients that are currently known to be
-     * unregistered (i.e. have an unregistered timestamp set).
-     * <p>
-     * These can be skipped when sending group messages; otherwise every send
-     * re-attempts them via the slow legacy 1:1 fan-out. The unregistered flag is
-     * maintained independently by profile/CDS discovery and cleared again once a
-     * recipient registers, so they are re-included automatically.
-     */
-    public Set<RecipientId> getUnregisteredRecipientIds(final Set<RecipientId> recipientIds) {
-        if (recipientIds.isEmpty()) {
-            return Set.of();
-        }
-        final var recipientIdsCommaSeparated = recipientIds.stream()
-                .map(recipientId -> String.valueOf(recipientId.id()))
-                .collect(Collectors.joining(","));
-        final var sql = (
-                """
-                SELECT r._id
-                FROM %s r
-                WHERE r.unregistered_timestamp IS NOT NULL AND r._id IN (%s)
-                """
-        ).formatted(TABLE_RECIPIENT, recipientIdsCommaSeparated);
-        try (final var connection = database.getConnection()) {
-            try (final var statement = connection.prepareStatement(sql)) {
-                try (var result = Utils.executeQueryForStream(statement, this::getRecipientIdFromResultSet)) {
-                    return result.collect(Collectors.toSet());
-                }
-            }
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed read from recipient store", e);
-        }
-    }
-
    public Set<String> getAllNumbers() {
        final var sql = (
                """
@ -893,7 +842,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
        final var sql = (
                """
                UPDATE %s
-                SET given_name = ?, family_name = ?, nick_name = ?, expiration_time = ?, expiration_time_version = ?, mute_until = ?, hide_story = ?, profile_sharing = ?, color = ?, blocked = ?, blocked_at = ?, archived = ?, unregistered_timestamp = ?, nick_name_given_name = ?, nick_name_family_name = ?, note = ?, hidden = ?
+                SET given_name = ?, family_name = ?, nick_name = ?, expiration_time = ?, expiration_time_version = ?, mute_until = ?, hide_story = ?, profile_sharing = ?, color = ?, blocked = ?, archived = ?, unregistered_timestamp = ?, nick_name_given_name = ?, nick_name_family_name = ?, note = ?, hidden = ?
                WHERE _id = ?
                """
        ).formatted(TABLE_RECIPIENT);
@ -908,52 +857,28 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
            statement.setBoolean(8, contact != null && contact.isProfileSharingEnabled());
            statement.setString(9, contact == null ? null : contact.color());
            statement.setBoolean(10, contact != null && contact.isBlocked());
-            statement.setLong(11, contact == null ? 0 : contact.blockedAt());
-            statement.setBoolean(12, contact != null && contact.isArchived());
+            statement.setBoolean(11, contact != null && contact.isArchived());
            if (contact == null || contact.unregisteredTimestamp() == null) {
-                statement.setNull(13, Types.INTEGER);
+                statement.setNull(12, Types.INTEGER);
            } else {
-                statement.setLong(13, contact.unregisteredTimestamp());
+                statement.setLong(12, contact.unregisteredTimestamp());
            }
-            statement.setString(14, contact == null ? null : contact.nickNameGivenName());
-            statement.setString(15, contact == null ? null : contact.nickNameFamilyName());
-            statement.setString(16, contact == null ? null : contact.note());
-            statement.setBoolean(17, contact != null && contact.isHidden());
-            statement.setLong(18, recipientId.id());
+            statement.setString(13, contact == null ? null : contact.nickNameGivenName());
+            statement.setString(14, contact == null ? null : contact.nickNameFamilyName());
+            statement.setString(15, contact == null ? null : contact.note());
+            statement.setBoolean(16, contact != null && contact.isHidden());
+            statement.setLong(17, recipientId.id());
            statement.executeUpdate();
        }
        if (contact != null && contact.unregisteredTimestamp() != null) {
-            markUnregisteredAndSplitIfNecessary(connection, recipientId, contact.unregisteredTimestamp());
+            markUnregisteredAndSplitIfNecessary(connection, recipientId);
        }
        rotateStorageId(connection, recipientId);
    }

-    public void splitForStorageSyncIfNecessary(final Connection connection, final ACI aci) throws SQLException {
-        final var recipient = findByServiceId(connection, aci);
-        if (recipient.isEmpty()) {
-            return;
-        }
-
-        final var recipientId = recipient.get().id();
-        final var address = recipient.get().address();
-        if (address.pni().isEmpty() && address.number().isEmpty()) {
-            return;
-        }
-
-        logger.debug("Splitting {} for storage sync", recipientId);
-        final var splitAddress = new RecipientAddress(Optional.empty(),
-                address.pni(),
-                address.number(),
-                Optional.empty());
-        updateRecipientAddress(connection,
-                recipientId,
-                new RecipientAddress(address.aci(), Optional.empty(), Optional.empty(), address.username()));
-        resolveRecipientTrusted(connection, splitAddress);
-    }
-
    public int removeStorageIdsFromLocalOnlyUnregisteredRecipients(
            final Connection connection,
-            final Collection<StorageId> storageIds
+            final List<StorageId> storageIds
    ) throws SQLException {
        final var sql = (
                """
@ -992,69 +917,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
        }
    }

-    public void markPniSignatureVerified(final RecipientId recipientId) {
-        logger.debug("Marking {} as pni signature verified", recipientId);
-        try (final var connection = database.getConnection()) {
-            connection.setAutoCommit(false);
-            if (storePniSignatureVerified(connection, recipientId, true)) {
-                rotateStorageId(connection, recipientId);
-            }
-            connection.commit();
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed update recipient store", e);
-        }
-    }
-
-    public boolean storePniSignatureVerified(
-            final Connection connection,
-            final RecipientId recipientId,
-            final boolean value
-    ) throws SQLException {
-        return storePniSignatureVerified(connection, recipientId, value, false);
-    }
-
-    private boolean storePniSignatureVerified(
-            final Connection connection,
-            final RecipientId recipientId,
-            final boolean value,
-            final boolean force
-    ) throws SQLException {
-        if (!force && isPniSignatureVerified(connection, recipientId) == value) {
-            return false;
-        }
-
-        final var sql = (
-                """
-                UPDATE %s
-                SET pni_signature_verified = ?
-                WHERE _id = ?
-                """
-        ).formatted(TABLE_RECIPIENT);
-        try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBoolean(1, value);
-            statement.setLong(2, recipientId.id());
-            statement.executeUpdate();
-        }
-        return true;
-    }
-
-    private boolean isPniSignatureVerified(
-            final Connection connection,
-            final RecipientId recipientId
-    ) throws SQLException {
-        final var sql = (
-                """
-                SELECT pni_signature_verified
-                FROM %s
-                WHERE _id = ?
-                """
-        ).formatted(TABLE_RECIPIENT);
-        try (final var statement = connection.prepareStatement(sql)) {
-            statement.setLong(1, recipientId.id());
-            return Utils.executeQuerySingleRow(statement, resultSet -> resultSet.getBoolean("pni_signature_verified"));
-        }
-    }
-
    public boolean needsPniSignature(final RecipientId recipientId) {
        try (final var connection = database.getConnection()) {
            final var sql = (
@ -1086,7 +948,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                    if (recipientAddress.get().address().aci().isEmpty() || (
                            contact != null && contact.unregisteredTimestamp() != null
                    )) {
-                        markUnregisteredAndSplitIfNecessary(connection, recipientId, System.currentTimeMillis());
+                        markUnregisteredAndSplitIfNecessary(connection, recipientId);
                    }
                }
            }
@ -1120,7 +982,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
            if (registered) {
                markRegistered(connection, recipientId);
            } else {
-                markUnregisteredAndSplitIfNecessary(connection, recipientId, System.currentTimeMillis());
+                markUnregisteredAndSplitIfNecessary(connection, recipientId);
            }
            connection.commit();
        } catch (SQLException e) {
@ -1130,10 +992,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re

    private void markUnregisteredAndSplitIfNecessary(
            final Connection connection,
-            final RecipientId recipientId,
-            final long unregisteredTimestamp
+            final RecipientId recipientId
    ) throws SQLException {
-        markUnregistered(connection, recipientId, unregisteredTimestamp);
+        markUnregistered(connection, recipientId);
        final var address = resolveRecipientAddress(connection, recipientId);
        final var needSplit = address.aci().isPresent() && address.pni().isPresent();
        logger.trace("Marking unregistered recipient {} as unregistered (and split={}): {}",
@ -1180,11 +1041,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
        }
    }

-    private void markUnregistered(
-            final Connection connection,
-            final RecipientId recipientId,
-            final long unregisteredTimestamp
-    ) throws SQLException {
+    private void markUnregistered(final Connection connection, final RecipientId recipientId) throws SQLException {
        final var sql = (
                """
                UPDATE %s
@ -1193,7 +1050,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                """
        ).formatted(TABLE_RECIPIENT);
        try (final var statement = connection.prepareStatement(sql)) {
-            statement.setLong(1, unregisteredTimestamp);
+            statement.setLong(1, System.currentTimeMillis());
            statement.setLong(2, recipientId.id());
            statement.executeUpdate();
        }
@ -1354,9 +1211,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
            final List<RecipientId> toBeMergedRecipientIds
    ) throws SQLException {
        for (final var toBeMergedRecipientId : toBeMergedRecipientIds) {
-            if (isPniSignatureVerified(connection, toBeMergedRecipientId)) {
-                storePniSignatureVerified(connection, recipientId, true, true);
-            }
            recipientMergeHandler.mergeRecipients(connection, recipientId, toBeMergedRecipientId);
            deleteRecipient(connection, toBeMergedRecipientId);
            recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(toBeMergedRecipientId));
@ -1451,12 +1305,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
        final var sql = (
                """
                UPDATE %s
-                SET number = NULL,
-                    aci = NULL,
-                    pni = NULL,
-                    username = NULL,
-                    storage_id = NULL,
-                    pni_signature_verified = FALSE
+                SET number = NULL, aci = NULL, pni = NULL, username = NULL, storage_id = NULL
                WHERE _id = ?
                """
        ).formatted(TABLE_RECIPIENT);
@ -1472,18 +1321,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
            final RecipientAddress address
    ) throws SQLException {
        recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
-        final var existingAddress = resolveRecipientAddress(connection, recipientId);
-        final var keepPniSignatureVerified = Objects.equals(existingAddress.aci(), address.aci()) && Objects.equals(
-                existingAddress.pni(),
-                address.pni());
        final var sql = (
                """
                UPDATE %s
-                SET number = ?,
-                    aci = ?,
-                    pni = ?,
-                    username = ?,
-                    pni_signature_verified = ?
+                SET number = ?, aci = ?, pni = ?, username = ?
                WHERE _id = ?
                """
        ).formatted(TABLE_RECIPIENT);
@ -1492,8 +1333,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
            statement.setString(2, address.aci().map(ACI::toString).orElse(null));
            statement.setString(3, address.pni().map(PNI::toString).orElse(null));
            statement.setString(4, address.username().orElse(null));
-            statement.setBoolean(5, keepPniSignatureVerified && isPniSignatureVerified(connection, recipientId));
-            statement.setLong(6, recipientId.id());
+            statement.setLong(5, recipientId.id());
            statement.executeUpdate();
        }
        rotateStorageId(connection, recipientId);
@ -1518,14 +1358,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
            RecipientId toBeMergedRecipientId
    ) throws SQLException {
        final var contact = getContact(connection, recipientId);
-        final var toBeMergedContact = getContact(connection, toBeMergedRecipientId);
        if (contact == null) {
+            final var toBeMergedContact = getContact(connection, toBeMergedRecipientId);
            storeContact(connection, recipientId, toBeMergedContact);
-        } else if (toBeMergedContact != null) {
-            final var mergedContact = mergeContacts(contact, toBeMergedContact);
-            if (!contact.equals(mergedContact)) {
-                storeContact(connection, recipientId, mergedContact);
-            }
        }

        final var profileKey = getProfileKey(connection, recipientId);
@ -1550,24 +1385,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
        recipientsMerged.put(toBeMergedRecipientId.id(), recipientId.id());
    }

-    static Contact mergeContacts(final Contact primary, final Contact secondary) {
-        final var profileSharingEnabled = primary.isProfileSharingEnabled() || secondary.isProfileSharingEnabled();
-        return Contact.newBuilder(primary)
-                .withGivenName(secondary.givenName())
-                .withFamilyName(secondary.familyName())
-                .withMessageExpirationTime(primary.messageExpirationTime() > 0
-                        ? primary.messageExpirationTime()
-                        : secondary.messageExpirationTime())
-                .withMessageExpirationTimeVersion(Math.max(primary.messageExpirationTimeVersion(),
-                        secondary.messageExpirationTimeVersion()))
-                .withMuteUntil(primary.muteUntil() > 0 ? primary.muteUntil() : secondary.muteUntil())
-                .withIsBlocked(primary.isBlocked() || secondary.isBlocked())
-                .withBlockedAt(Math.max(primary.blockedAt(), secondary.blockedAt()))
-                .withIsProfileSharingEnabled(profileSharingEnabled)
-                .withIsHidden(profileSharingEnabled ? false : primary.isHidden())
-                .build();
-    }
-
    private Optional<RecipientWithAddress> findByNumber(
            final Connection connection,
            final String number
@ -1647,7 +1464,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
    private Contact getContact(final Connection connection, final RecipientId recipientId) throws SQLException {
        final var sql = (
                """
-                SELECT r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.blocked_at, r.archived, r.hidden, r.unregistered_timestamp
+                SELECT r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
                FROM %s r
                WHERE r._id = ? AND (%s)
                """
@ -1734,7 +1551,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                getProfileFromResultSet(resultSet),
                getDiscoverableFromResultSet(resultSet),
                getUnregisteredTimestampFromResultSet(resultSet),
-                resultSet.getBoolean("pni_signature_verified"),
                getStorageRecordFromResultSet(resultSet));
    }

@ -1752,7 +1568,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                resultSet.getLong("mute_until"),
                resultSet.getBoolean("hide_story"),
                resultSet.getBoolean("blocked"),
-                resultSet.getLong("blocked_at"),
                resultSet.getBoolean("archived"),
                resultSet.getBoolean("profile_sharing"),
                resultSet.getBoolean("hidden"),
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@ -18,7 +18,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedHashMap;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@ -28,15 +28,8 @@ public class SessionStore implements SignalServiceSessionStore {

    private static final String TABLE_SESSION = "session";
    private static final Logger logger = LoggerFactory.getLogger(SessionStore.class);
-    private static final int MAX_CACHE_SIZE = 1000;

-    private final Map<Key, SessionRecord> cachedSessions = new LinkedHashMap<>(16, 0.75f, true) {
-
-        @Override
-        protected boolean removeEldestEntry(Map.Entry<Key, SessionRecord> eldest) {
-            return size() > MAX_CACHE_SIZE;
-        }
-    };
+    private final Map<Key, SessionRecord> cachedSessions = new HashMap<>();

    private final Database database;
    private final int accountIdType;
--- a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerPack.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerPack.java
@ -1,29 +1,10 @@
 package org.asamk.signal.manager.storage.stickers;

 import org.asamk.signal.manager.api.StickerPackId;
-import org.whispersystems.signalservice.api.storage.StorageId;

-public record StickerPack(
-        long internalId,
-        StickerPackId packId,
-        byte[] packKey,
-        boolean isInstalled,
-        int position,
-        long deletedTimestamp,
-        StorageId storageId,
-        byte[] storageRecord
-) {
-
-    public StickerPack(
-            final long internalId,
-            final StickerPackId packId,
-            final byte[] packKey,
-            final boolean isInstalled
-    ) {
-        this(internalId, packId, packKey, isInstalled, 0, 0, null, null);
-    }
+public record StickerPack(long internalId, StickerPackId packId, byte[] packKey, boolean isInstalled) {

    public StickerPack(final StickerPackId packId, final byte[] packKey) {
-        this(-1, packId, packKey, false, 0, 0, null, null);
+        this(-1, packId, packKey, false);
    }
 }
--- a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
@ -3,19 +3,14 @@ package org.asamk.signal.manager.storage.stickers;
 import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.Utils;
-import org.asamk.signal.manager.util.KeyUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.storage.SignalStickerPackRecord;
-import org.whispersystems.signalservice.api.storage.StorageId;

 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Types;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;

 public class StickerStore {

@ -32,11 +27,7 @@ public class StickerStore {
                                      _id INTEGER PRIMARY KEY,
                                      pack_id BLOB UNIQUE NOT NULL,
                                      pack_key BLOB NOT NULL,
-                                      installed INTEGER NOT NULL DEFAULT FALSE,
-                                      position INTEGER NOT NULL DEFAULT 0,
-                                      deleted_timestamp INTEGER NOT NULL DEFAULT 0,
-                                      storage_id BLOB UNIQUE,
-                                      storage_record BLOB
+                                      installed INTEGER NOT NULL DEFAULT FALSE
                                    ) STRICT;
                                    """);
        }
@ -47,103 +38,55 @@ public class StickerStore {
    }

    public List<StickerPack> getStickerPacks() {
-        try (final var connection = database.getConnection()) {
-            return getStickerPacks(connection);
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed read from sticker store", e);
-        }
-    }
-
-    public List<StickerPack> getStickerPacks(final Connection connection) throws SQLException {
        final var sql = (
                """
-                SELECT s._id, s.pack_id, s.pack_key, s.installed, s.position, s.deleted_timestamp, s.storage_id, s.storage_record
+                SELECT s._id, s.pack_id, s.pack_key, s.installed
                FROM %s s
                """
        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            try (var result = Utils.executeQueryForStream(statement, this::getStickerPackFromResultSet)) {
-                return result.toList();
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                try (var result = Utils.executeQueryForStream(statement, this::getStickerPackFromResultSet)) {
+                    return result.toList();
+                }
            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from sticker store", e);
        }
    }

    public StickerPack getStickerPack(StickerPackId packId) {
-        try (final var connection = database.getConnection()) {
-            return getStickerPack(connection, packId);
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed read from sticker store", e);
-        }
-    }
-
-    public StickerPack getStickerPack(Connection connection, StickerPackId packId) throws SQLException {
        final var sql = (
                """
-                SELECT s._id, s.pack_id, s.pack_key, s.installed, s.position, s.deleted_timestamp, s.storage_id, s.storage_record
+                SELECT s._id, s.pack_id, s.pack_key, s.installed
                FROM %s s
                WHERE s.pack_id = ?
                """
        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, packId.serialize());
-            return Utils.executeQueryForOptional(statement, this::getStickerPackFromResultSet).orElse(null);
-        }
-    }
-
-    public StickerPack getStickerPack(Connection connection, StorageId storageId) throws SQLException {
-        final var sql = (
-                """
-                SELECT s._id, s.pack_id, s.pack_key, s.installed, s.position, s.deleted_timestamp, s.storage_id, s.storage_record
-                FROM %s s
-                WHERE s.storage_id = ?
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, storageId.getRaw());
-            return Utils.executeQueryForOptional(statement, this::getStickerPackFromResultSet).orElse(null);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setBytes(1, packId.serialize());
+                return Utils.executeQueryForOptional(statement, this::getStickerPackFromResultSet).orElse(null);
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from sticker store", e);
        }
    }

    public void addStickerPack(StickerPack stickerPack) {
        final var sql = (
                """
-                INSERT INTO %s (pack_id, pack_key, installed, position, deleted_timestamp, storage_id, storage_record)
-                VALUES (?, ?, ?, ?, ?, ?, ?)
+                INSERT INTO %s (pack_id, pack_key, installed)
+                VALUES (?, ?, ?)
                """
        ).formatted(TABLE_STICKER);
        try (final var connection = database.getConnection()) {
-            connection.setAutoCommit(false);
-            var storageId = stickerPack.storageId();
-            if (storageId == null && (stickerPack.isInstalled() || stickerPack.deletedTimestamp() > 0)) {
-                storageId = StorageId.forStickerPack(KeyUtils.createRawStorageId());
-            }
-
-            final var position = stickerPack.isInstalled() ? Math.max(stickerPack.position(),
-                    getNextPosition(connection)) : 0;
-            var deletedTimestamp = stickerPack.deletedTimestamp();
-            if (!stickerPack.isInstalled() && deletedTimestamp == 0 && storageId != null) {
-                deletedTimestamp = System.currentTimeMillis();
-            }
-
            try (final var statement = connection.prepareStatement(sql)) {
                statement.setBytes(1, stickerPack.packId().serialize());
                statement.setBytes(2, stickerPack.packKey());
                statement.setBoolean(3, stickerPack.isInstalled());
-                statement.setInt(4, position);
-                statement.setLong(5, deletedTimestamp);
-                if (storageId == null) {
-                    statement.setNull(6, Types.BLOB);
-                } else {
-                    statement.setBytes(6, storageId.getRaw());
-                }
-                if (stickerPack.storageRecord() == null) {
-                    statement.setNull(7, Types.BLOB);
-                } else {
-                    statement.setBytes(7, stickerPack.storageRecord());
-                }
                statement.executeUpdate();
            }
-            connection.commit();
        } catch (SQLException e) {
            throw new RuntimeException("Failed update sticker store", e);
        }
@ -153,279 +96,28 @@ public class StickerStore {
        final var sql = (
                """
                UPDATE %s
-                SET installed = ?, position = ?, deleted_timestamp = ?, storage_id = ?
+                SET installed = ?
                WHERE pack_id = ?
                """
        ).formatted(TABLE_STICKER);
        try (final var connection = database.getConnection()) {
-            connection.setAutoCommit(false);
-            final var existing = getStickerPack(connection, stickerPackId);
-            if (existing == null || existing.isInstalled() == installed) {
-                connection.commit();
-                return;
-            }
-
-            final var newStorageId = StorageId.forStickerPack(KeyUtils.createRawStorageId());
-            final var position = installed ? getNextPosition(connection) : 0;
-            final var deletedTimestamp = installed ? 0 : System.currentTimeMillis();
-
            try (final var statement = connection.prepareStatement(sql)) {
-                statement.setBoolean(1, installed);
-                statement.setInt(2, position);
-                statement.setLong(3, deletedTimestamp);
-                statement.setBytes(4, newStorageId.getRaw());
-                statement.setBytes(5, stickerPackId.serialize());
+                statement.setBytes(1, stickerPackId.serialize());
+                statement.setBoolean(2, installed);
                statement.executeUpdate();
            }
-            connection.commit();
        } catch (SQLException e) {
            throw new RuntimeException("Failed update sticker store", e);
        }
    }

-    public List<StorageId> getStorageIds(final Connection connection) throws SQLException {
-        final var sql = (
-                """
-                SELECT s.storage_id
-                FROM %s s
-                WHERE s.storage_id IS NOT NULL
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            return Utils.executeQueryForStream(statement, this::getStorageIdFromResultSet).toList();
-        }
-    }
-
-    public void updateStorageId(
-            final Connection connection,
-            final StickerPackId packId,
-            final StorageId storageId
-    ) throws SQLException {
-        final var sql = (
-                """
-                UPDATE %s
-                SET storage_id = ?
-                WHERE pack_id = ?
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, storageId.getRaw());
-            statement.setBytes(2, packId.serialize());
-            statement.executeUpdate();
-        }
-    }
-
-    public void updateStorageIds(
-            final Connection connection,
-            final Map<StickerPackId, StorageId> storageIdMap
-    ) throws SQLException {
-        final var sql = (
-                """
-                UPDATE %s
-                SET storage_id = ?
-                WHERE pack_id = ?
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            for (final var entry : storageIdMap.entrySet()) {
-                statement.setBytes(1, entry.getValue().getRaw());
-                statement.setBytes(2, entry.getKey().serialize());
-                statement.executeUpdate();
-            }
-        }
-    }
-
-    public StorageId getStorageId(final Connection connection, final StickerPackId packId) throws SQLException {
-        final var sql = (
-                """
-                SELECT s.storage_id
-                FROM %s s
-                WHERE s.pack_id = ? AND s.storage_id IS NOT NULL
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, packId.serialize());
-            final var storageId = Utils.executeQueryForOptional(statement, this::getStorageIdFromResultSet);
-            if (storageId.isPresent()) {
-                return storageId.get();
-            }
-        }
-
-        final var newStorageId = StorageId.forStickerPack(KeyUtils.createRawStorageId());
-        updateStorageId(connection, packId, newStorageId);
-        return newStorageId;
-    }
-
-    public void storeStorageRecord(
-            final Connection connection,
-            final StickerPackId packId,
-            final StorageId storageId,
-            final byte[] storageRecord
-    ) throws SQLException {
-        final var clearSql = (
-                """
-                UPDATE %s
-                SET storage_id = NULL
-                WHERE storage_id = ?
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(clearSql)) {
-            statement.setBytes(1, storageId.getRaw());
-            statement.executeUpdate();
-        }
-
-        final var updateSql = (
-                """
-                UPDATE %s
-                SET storage_id = ?, storage_record = ?
-                WHERE pack_id = ?
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(updateSql)) {
-            statement.setBytes(1, storageId.getRaw());
-            if (storageRecord == null) {
-                statement.setNull(2, Types.BLOB);
-            } else {
-                statement.setBytes(2, storageRecord);
-            }
-            statement.setBytes(3, packId.serialize());
-            statement.executeUpdate();
-        }
-    }
-
-    public void setMissingStorageIds() {
-        final var selectSql = (
-                """
-                SELECT s.pack_id
-                FROM %s s
-                WHERE s.storage_id IS NULL AND s.installed = TRUE
-                """
-        ).formatted(TABLE_STICKER);
-        final var updateSql = (
-                """
-                UPDATE %s
-                SET storage_id = ?
-                WHERE pack_id = ?
-                """
-        ).formatted(TABLE_STICKER);
-
-        try (final var connection = database.getConnection()) {
-            connection.setAutoCommit(false);
-            try (final var selectStatement = connection.prepareStatement(selectSql)) {
-                final var packIds = Utils.executeQueryForStream(selectStatement,
-                        resultSet -> StickerPackId.deserialize(resultSet.getBytes("pack_id"))).toList();
-                try (final var updateStatement = connection.prepareStatement(updateSql)) {
-                    for (final var packId : packIds) {
-                        updateStatement.setBytes(1, KeyUtils.createRawStorageId());
-                        updateStatement.setBytes(2, packId.serialize());
-                        updateStatement.executeUpdate();
-                    }
-                }
-            }
-            connection.commit();
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed update sticker store", e);
-        }
-    }
-
-    public int removeStorageIdsFromLocalOnlyDeletedStickerPacks(
-            final Connection connection,
-            final Collection<StorageId> storageIds
-    ) throws SQLException {
-        final var sql = (
-                """
-                UPDATE %s
-                SET storage_id = NULL
-                WHERE storage_id = ? AND installed = FALSE AND deleted_timestamp > 0
-                """
-        ).formatted(TABLE_STICKER);
-        var count = 0;
-        try (final var statement = connection.prepareStatement(sql)) {
-            for (final var storageId : storageIds) {
-                statement.setBytes(1, storageId.getRaw());
-                count += statement.executeUpdate();
-            }
-        }
-        return count;
-    }
-
-    public void upsertFromStorageSync(
-            final Connection connection,
-            final SignalStickerPackRecord record
-    ) throws SQLException {
-        final var remote = record.getProto();
-        final var packId = StickerPackId.deserialize(remote.packId.toByteArray());
-        final var deleted = remote.deletedAtTimestamp > 0;
-        final var packKey = remote.packKey.toByteArray();
-        final var storageRecord = remote.encode();
-
-        final var current = getStickerPack(connection, packId);
-
-        if (current == null) {
-            final var insertSql = (
-                    """
-                    INSERT INTO %s (pack_id, pack_key, installed, position, deleted_timestamp, storage_id, storage_record)
-                    VALUES (?, ?, ?, ?, ?, ?, ?)
-                    """
-            ).formatted(TABLE_STICKER);
-            try (final var statement = connection.prepareStatement(insertSql)) {
-                statement.setBytes(1, packId.serialize());
-                statement.setBytes(2, packKey);
-                statement.setBoolean(3, !deleted);
-                statement.setInt(4, deleted ? 0 : remote.position);
-                statement.setLong(5, remote.deletedAtTimestamp);
-                statement.setBytes(6, record.getId().getRaw());
-                statement.setBytes(7, storageRecord);
-                statement.executeUpdate();
-            }
-            return;
-        }
-
-        if (packKey.length > 0) {
-            final var updateSql = (
-                    """
-                    UPDATE %s
-                    SET pack_key = ?, installed = ?, position = ?, deleted_timestamp = ?, storage_id = ?, storage_record = ?
-                    WHERE pack_id = ?
-                    """
-            ).formatted(TABLE_STICKER);
-            try (final var statement = connection.prepareStatement(updateSql)) {
-                statement.setBytes(1, packKey);
-                statement.setBoolean(2, !deleted);
-                statement.setInt(3, deleted ? 0 : remote.position);
-                statement.setLong(4, remote.deletedAtTimestamp);
-                statement.setBytes(5, record.getId().getRaw());
-                statement.setBytes(6, storageRecord);
-                statement.setBytes(7, packId.serialize());
-                statement.executeUpdate();
-            }
-        } else {
-            final var updateSql = (
-                    """
-                    UPDATE %s
-                    SET installed = ?, position = ?, deleted_timestamp = ?, storage_id = ?, storage_record = ?
-                    WHERE pack_id = ?
-                    """
-            ).formatted(TABLE_STICKER);
-            try (final var statement = connection.prepareStatement(updateSql)) {
-                statement.setBoolean(1, !deleted);
-                statement.setInt(2, deleted ? 0 : remote.position);
-                statement.setLong(3, remote.deletedAtTimestamp);
-                statement.setBytes(4, record.getId().getRaw());
-                statement.setBytes(5, storageRecord);
-                statement.setBytes(6, packId.serialize());
-                statement.executeUpdate();
-            }
-        }
-    }
-
    void addLegacyStickers(Collection<StickerPack> stickerPacks) {
        logger.debug("Migrating legacy stickers to database");
        long start = System.nanoTime();
        final var sql = (
                """
-                INSERT INTO %s (pack_id, pack_key, installed, position, deleted_timestamp, storage_id, storage_record)
-                VALUES (?, ?, ?, ?, ?, ?, ?)
+                INSERT INTO %s (pack_id, pack_key, installed)
+                VALUES (?, ?, ?)
                """
        ).formatted(TABLE_STICKER);
        try (final var connection = database.getConnection()) {
@ -433,23 +125,11 @@ public class StickerStore {
            try (final var statement = connection.prepareStatement("DELETE FROM %s".formatted(TABLE_STICKER))) {
                statement.executeUpdate();
            }
-            var installedPosition = 0;
            try (final var statement = connection.prepareStatement(sql)) {
                for (final var sticker : stickerPacks) {
-                    final var storageId = sticker.isInstalled()
-                            ? StorageId.forStickerPack(KeyUtils.createRawStorageId())
-                            : null;
                    statement.setBytes(1, sticker.packId().serialize());
                    statement.setBytes(2, sticker.packKey());
                    statement.setBoolean(3, sticker.isInstalled());
-                    statement.setInt(4, sticker.isInstalled() ? installedPosition++ : 0);
-                    statement.setLong(5, 0);
-                    if (storageId == null) {
-                        statement.setNull(6, Types.BLOB);
-                    } else {
-                        statement.setBytes(6, storageId.getRaw());
-                    }
-                    statement.setNull(7, Types.BLOB);
                    statement.executeUpdate();
                }
            }
@ -465,36 +145,6 @@ public class StickerStore {
        final var packId = resultSet.getBytes("pack_id");
        final var packKey = resultSet.getBytes("pack_key");
        final var installed = resultSet.getBoolean("installed");
-        final var position = resultSet.getInt("position");
-        final var deletedTimestamp = resultSet.getLong("deleted_timestamp");
-        final var storageIdBytes = resultSet.getBytes("storage_id");
-        final var storageId = storageIdBytes == null ? null : StorageId.forStickerPack(storageIdBytes);
-        final var storageRecord = resultSet.getBytes("storage_record");
-        return new StickerPack(internalId,
-                StickerPackId.deserialize(packId),
-                packKey,
-                installed,
-                position,
-                deletedTimestamp,
-                storageId,
-                storageRecord);
-    }
-
-    private StorageId getStorageIdFromResultSet(final ResultSet resultSet) throws SQLException {
-        final var storageId = resultSet.getBytes("storage_id");
-        return StorageId.forStickerPack(storageId);
-    }
-
-    private int getNextPosition(final Connection connection) throws SQLException {
-        final var sql = (
-                """
-                SELECT IFNULL(MAX(position) + 1, 0) AS next_position
-                FROM %s
-                WHERE installed = TRUE
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            return Utils.executeQuerySingleRow(statement, resultSet -> resultSet.getInt("next_position"));
-        }
+        return new StickerPack(internalId, StickerPackId.deserialize(packId), packKey, installed);
    }
 }
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@ -24,7 +24,6 @@ import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.Id
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
@ -57,29 +56,6 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
        this.selfNumber = account.getNumber();
    }

-    public void prepare(final Collection<SignalContactRecord> remoteRecords) throws SQLException {
-        for (final var remoteRecord : remoteRecords) {
-            if (isInvalid(remoteRecord)) {
-                continue;
-            }
-            final var remote = remoteRecord.getProto();
-            final var aci = ACI.parseOrNull(remote.aci, remote.aciBinary);
-            final var pni = PNI.parseOrNull(remote.pni, remote.pniBinary);
-            if (shouldSplitForStorageSync(remote.unregisteredAtTimestamp, aci, pni, remote.e164)) {
-                account.getRecipientStore().splitForStorageSyncIfNecessary(connection, aci);
-            }
-        }
-    }
-
-    static boolean shouldSplitForStorageSync(
-            final long unregisteredAtTimestamp,
-            final ACI aci,
-            final PNI pni,
-            final String e164
-    ) {
-        return unregisteredAtTimestamp > 0 && aci != null && pni == null && e164.isEmpty();
-    }
-
    /**
     * Error cases:
     * - You can't have a contact record without an ACI or PNI.
@ -141,35 +117,24 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal

        IdentityState identityState;
        ByteString identityKey;
+        if (remote.identityKey.size() > 0 && (
+                !account.isPrimaryDevice()
+                        || remote.identityState != local.identityState
+                        || local.identityKey.size() == 0

-        // Parse ACI/PNI first so we can determine if contact has identity
-        final var localAci = ACI.parseOrNull(local.aci, local.aciBinary);
-        final var localPni = PNI.parseOrNull(local.pni, local.pniBinary);
-        final var remoteAci = ACI.parseOrNull(remote.aci, remote.aciBinary);
-        final var remotePni = PNI.parseOrNull(remote.pni, remote.pniBinary);
-
-        final var hasLocalIdentity = localAci != null || localPni != null;
-        final var hasRemoteIdentity = remoteAci != null || remotePni != null;
-
-        final var remoteIdentityKeySize = remote.identityKey.size();
-        final var localIdentityKeySize = local.identityKey.size();
-        final var statesDiffer = remote.identityState != local.identityState;
-
-        if (remoteIdentityKeySize > 0 && (!account.isPrimaryDevice() || statesDiffer || localIdentityKeySize == 0)) {
+        )) {
            identityState = remote.identityState;
            identityKey = remote.identityKey;
        } else {
            identityState = local.identityState;
-            // Only use local's identity key if:
-            // 1. Contact has ACI or PNI
-            // 2. Remote also has an identity key (if remote size=0, respect that decision)
-            if (hasLocalIdentity && localIdentityKeySize > 0 && remoteIdentityKeySize > 0) {
-                identityKey = local.identityKey;
-            } else {
-                identityKey = ByteString.EMPTY;
-            }
+            identityKey = local.identityKey.size() > 0 ? local.identityKey : ByteString.EMPTY;
        }

+        final var localAci = ACI.parseOrNull(local.aci, local.aciBinary);
+        final var localPni = PNI.parseOrNull(local.pni, local.pniBinary);
+        final var remoteAci = ACI.parseOrNull(remote.aci, remote.aciBinary);
+        final var remotePni = PNI.parseOrNull(remote.pni, remote.pniBinary);
+
        if (localAci != null
                && local.identityKey.size() > 0
                && remote.identityKey.size() > 0
@ -229,7 +194,6 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                .identityState(identityState)
                .identityKey(identityKey)
                .blocked(remote.blocked)
-                .blockedAtTimestamp(remote.blockedAtTimestamp)
                .whitelisted(remote.whitelisted)
                .archived(remote.archived)
                .markedUnread(remote.markedUnread)
@ -308,9 +272,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
        final var contactNickGivenName = contact == null ? null : contact.nickNameGivenName();
        final var contactNickFamilyName = contact == null ? null : contact.nickNameFamilyName();
        final var contactNote = contact == null ? null : contact.note();
-        final var blockedAt = contact == null ? 0 : contact.blockedAt();
        if (blocked != contactProto.blocked
-                || blockedAt != contactProto.blockedAtTimestamp
                || profileShared != contactProto.whitelisted
                || archived != contactProto.archived
                || hidden != contactProto.hidden
@ -328,7 +290,6 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
            logger.debug("Storing new or updated contact {}", recipientId);
            final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
            final var newContact = contactBuilder.withIsBlocked(contactProto.blocked)
-                    .withBlockedAt(contactProto.blocked ? contactProto.blockedAtTimestamp : 0)
                    .withIsProfileSharingEnabled(contactProto.whitelisted)
                    .withIsArchived(contactProto.archived)
                    .withIsHidden(contactProto.hidden)
@ -385,8 +346,6 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                logger.warn("Received invalid contact identity key from storage");
            }
        }
-        account.getRecipientStore()
-                .storePniSignatureVerified(connection, recipientId, contactProto.pniSignatureVerified);
        account.getRecipientStore()
                .storeStorageRecord(connection, recipientId, contactRecord.getId(), contactProto.encode());
    }
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
@ -6,9 +6,7 @@ import org.whispersystems.signalservice.api.storage.SignalRecord;
 import org.whispersystems.signalservice.api.storage.StorageId;

 import java.sql.SQLException;
-import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
@ -26,7 +24,6 @@ abstract class DefaultStorageRecordProcessor<E extends SignalRecord<?>> implemen

    private static final Logger logger = LoggerFactory.getLogger(DefaultStorageRecordProcessor.class);
    private final Set<E> matchedRecords = new TreeSet<>(this);
-    private final Set<StorageId> updatedStorageIds = new HashSet<>();

    /**
     * One type of invalid remote data this handles is two records mapping to the same local data. We
@ -53,7 +50,6 @@ abstract class DefaultStorageRecordProcessor<E extends SignalRecord<?>> implemen

        if (local.isEmpty()) {
            debug(remote.getId(), remote, "[Local Insert] No matching local record. Inserting.");
-            updatedStorageIds.add(remote.getId());
            insertLocal(remote);
            return;
        }
@ -68,7 +64,6 @@ abstract class DefaultStorageRecordProcessor<E extends SignalRecord<?>> implemen
        matchedRecords.add(local.get());

        final var merged = merge(remote, local.get());
-        updatedStorageIds.add(merged.getId());
        if (!merged.equals(remote)) {
            debug(remote.getId(), remote, "[Remote Update] " + merged.describeDiff(remote));
        }
@ -80,10 +75,6 @@ abstract class DefaultStorageRecordProcessor<E extends SignalRecord<?>> implemen
        }
    }

-    public Set<StorageId> getUpdatedStorageIds() {
-        return Collections.unmodifiableSet(updatedStorageIds);
-    }
-
    private void debug(StorageId i, E record, String message) {
        logger.debug("[{}][{}] {}", i, record.getClass().getSimpleName(), message);
    }
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
@ -114,7 +114,6 @@ public final class GroupV1RecordProcessor extends DefaultStorageRecordProcessor<
        final var group = account.getGroupStore().getOrCreateGroupV1(connection, groupIdV1);
        if (group != null) {
            group.setBlocked(groupV1Proto.blocked);
-            group.setBlockedAt(0);
            account.getGroupStore().updateGroup(connection, group);
            account.getGroupStore()
                    .storeStorageRecord(connection, group.getGroupId(), groupV1Record.getId(), groupV1Proto.encode());
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
@ -56,7 +56,6 @@ public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<
        final var mergedBuilder = remote.newBuilder()
                .masterKey(remote.masterKey)
                .blocked(remote.blocked)
-                .blockedAtTimestamp(remote.blockedAtTimestamp)
                .whitelisted(remote.whitelisted)
                .archived(remote.archived)
                .markedUnread(remote.markedUnread)
@ -94,7 +93,6 @@ public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<

        final var group = account.getGroupStore().getGroupOrPartialMigrate(connection, groupMasterKey);
        group.setBlocked(groupV2Proto.blocked);
-        group.setBlockedAt(groupV2Proto.blocked ? groupV2Proto.blockedAtTimestamp : 0);
        group.setProfileSharingEnabled(groupV2Proto.whitelisted);
        account.getGroupStore().updateGroup(connection, group);
        account.getGroupStore()
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StickerPackRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StickerPackRecordProcessor.java
@ -1,86 +0,0 @@
-package org.asamk.signal.manager.syncStorage;
-
-import org.asamk.signal.manager.api.StickerPackId;
-import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.util.KeyUtils;
-import org.whispersystems.signalservice.api.storage.SignalStickerPackRecord;
-import org.whispersystems.signalservice.api.storage.StorageId;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Optional;
-
-public class StickerPackRecordProcessor extends DefaultStorageRecordProcessor<SignalStickerPackRecord> {
-
-    private static final int PACK_ID_LENGTH = 16;
-    private static final int PACK_KEY_LENGTH = 32;
-
-    private final SignalAccount account;
-    private final Connection connection;
-
-    public StickerPackRecordProcessor(final SignalAccount account, final Connection connection) {
-        this.account = account;
-        this.connection = connection;
-    }
-
-    @Override
-    public int compare(final SignalStickerPackRecord lhs, final SignalStickerPackRecord rhs) {
-        return lhs.getProto().packId.equals(rhs.getProto().packId) ? 0 : 1;
-    }
-
-    @Override
-    protected boolean isInvalid(final SignalStickerPackRecord remote) {
-        return remote.getProto().packId.size() != PACK_ID_LENGTH || (
-                remote.getProto().deletedAtTimestamp == 0 && remote.getProto().packKey.size() != PACK_KEY_LENGTH
-        );
-    }
-
-    @Override
-    protected Optional<SignalStickerPackRecord> getMatching(final SignalStickerPackRecord remote) throws SQLException {
-        final var packId = StickerPackId.deserialize(remote.getProto().packId.toByteArray());
-        final var local = account.getStickerStore().getStickerPack(connection, packId);
-
-        if (local == null || (!local.isInstalled() && local.deletedTimestamp() == 0)) {
-            return Optional.empty();
-        }
-
-        final StorageId storageId;
-        if (local.storageId() != null) {
-            storageId = local.storageId();
-        } else {
-            storageId = StorageId.forStickerPack(KeyUtils.createRawStorageId());
-            account.getStickerStore().updateStorageId(connection, packId, storageId);
-        }
-
-        return Optional.of(new SignalStickerPackRecord(storageId, StorageSyncModels.localToRemoteRecord(local)));
-    }
-
-    @Override
-    protected SignalStickerPackRecord merge(
-            final SignalStickerPackRecord remoteRecord,
-            final SignalStickerPackRecord localRecord
-    ) {
-        final var remote = remoteRecord.getProto();
-        final var local = localRecord.getProto();
-
-        if (shouldKeepLocalDeletion(remote.deletedAtTimestamp, local.deletedAtTimestamp)) {
-            return localRecord;
-        }
-
-        return remoteRecord;
-    }
-
-    static boolean shouldKeepLocalDeletion(final long remoteDeletedAt, final long localDeletedAt) {
-        return remoteDeletedAt > 0 && localDeletedAt > 0 && localDeletedAt < remoteDeletedAt;
-    }
-
-    @Override
-    protected void insertLocal(final SignalStickerPackRecord record) throws SQLException {
-        account.getStickerStore().upsertFromStorageSync(connection, record);
-    }
-
-    @Override
-    protected void updateLocal(final StorageRecordUpdate<SignalStickerPackRecord> update) throws SQLException {
-        account.getStickerStore().upsertFromStorageSync(connection, update.newRecord());
-    }
-}
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncLoopDetector.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncLoopDetector.java
@ -1,139 +0,0 @@
-package org.asamk.signal.manager.syncStorage;
-
-import org.asamk.signal.manager.util.LeakyBucket;
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.BooleanSupplier;
-
-public final class StorageSyncLoopDetector {
-
-    private static final int FINGERPRINT_HISTORY = 3;
-
-    private final BooleanSupplier isMultiDevice;
-    private final List<Integer> recentFingerprints = new ArrayList<>();
-    private final LeakyBucket contentBucket = new LeakyBucket(3,
-            Duration.ofHours(1).toMillis(),
-            new InMemoryBucketState());
-    private final LeakyBucket rateBucket = new LeakyBucket(100,
-            Duration.ofMinutes(10).toMillis(),
-            new InMemoryBucketState());
-
-    public StorageSyncLoopDetector(final BooleanSupplier isMultiDevice) {
-        this.isMultiDevice = isMultiDevice;
-    }
-
-    public synchronized Decision onWriteAttempt(
-            final WriteOperationResult write,
-            final boolean fetchedRemoteManifest,
-            final boolean isRetry
-    ) {
-        return onWriteAttempt(write, fetchedRemoteManifest, isRetry, System.currentTimeMillis());
-    }
-
-    synchronized Decision onWriteAttempt(
-            final WriteOperationResult write,
-            final boolean fetchedRemoteManifest,
-            final boolean isRetry,
-            final long now
-    ) {
-        if (!isMultiDevice.getAsBoolean() || isRetry) {
-            return Decision.Allowed.INSTANCE;
-        }
-
-        final var fingerprint = fingerprint(write);
-        final var chargeContent = fetchedRemoteManifest && fingerprint != null && recentFingerprints.contains(
-                fingerprint);
-
-        if (chargeContent && !contentBucket.hasRoom(now)) {
-            return new Decision.Denied(Cause.REPEATED_PAYLOAD, contentBucket.level(now));
-        }
-        if (fetchedRemoteManifest && !rateBucket.hasRoom(now)) {
-            return new Decision.Denied(Cause.WRITE_RATE, rateBucket.level(now));
-        }
-
-        if (chargeContent) {
-            contentBucket.use(now);
-        }
-        if (fetchedRemoteManifest) {
-            rateBucket.use(now);
-        }
-        if (fingerprint != null) {
-            remember(fingerprint);
-        }
-
-        return Decision.Allowed.INSTANCE;
-    }
-
-    public synchronized void onWriteFailed() {
-        onWriteFailed(System.currentTimeMillis());
-    }
-
-    synchronized void onWriteFailed(final long now) {
-        contentBucket.refund(now);
-        rateBucket.refund(now);
-    }
-
-    public synchronized void onConverged() {
-        contentBucket.clear();
-    }
-
-    private void remember(final int fingerprint) {
-        recentFingerprints.remove(Integer.valueOf(fingerprint));
-        recentFingerprints.addFirst(fingerprint);
-        if (recentFingerprints.size() > FINGERPRINT_HISTORY) {
-            recentFingerprints.removeLast();
-        }
-    }
-
-    private static Integer fingerprint(final WriteOperationResult write) {
-        if (write.inserts().isEmpty()) {
-            return null;
-        }
-
-        return write.inserts()
-                .stream()
-                .map(record -> Arrays.hashCode(record.getProto().encode()))
-                .sorted()
-                .toList()
-                .hashCode();
-    }
-
-    private static final class InMemoryBucketState implements LeakyBucket.State {
-
-        private int level;
-        private long levelUpdatedAt;
-
-        @Override
-        public int level() {
-            return level;
-        }
-
-        @Override
-        public long levelUpdatedAt() {
-            return levelUpdatedAt;
-        }
-
-        @Override
-        public void update(final int level, final long levelUpdatedAt) {
-            this.level = level;
-            this.levelUpdatedAt = levelUpdatedAt;
-        }
-    }
-
-    public enum Cause {
-        REPEATED_PAYLOAD,
-        WRITE_RATE
-    }
-
-    public sealed interface Decision {
-
-        enum Allowed implements Decision {
-            INSTANCE
-        }
-
-        record Denied(Cause cause, int level) implements Decision {}
-    }
-}
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@ -8,7 +8,6 @@ import org.asamk.signal.manager.storage.groups.GroupInfoV1;
 import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.asamk.signal.manager.storage.identities.IdentityInfo;
 import org.asamk.signal.manager.storage.recipients.Recipient;
-import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.signal.core.models.ServiceId.ACI;
 import org.signal.core.models.ServiceId.PNI;
 import org.signal.core.util.UuidUtil;
@ -17,14 +16,12 @@ import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
 import org.whispersystems.signalservice.api.storage.SignalContactRecord;
 import org.whispersystems.signalservice.api.storage.SignalGroupV1Record;
 import org.whispersystems.signalservice.api.storage.SignalGroupV2Record;
-import org.whispersystems.signalservice.api.storage.SignalStickerPackRecord;
 import org.whispersystems.signalservice.internal.storage.protos.AccountRecord;
 import org.whispersystems.signalservice.internal.storage.protos.AccountRecord.UsernameLink;
 import org.whispersystems.signalservice.internal.storage.protos.ContactRecord;
 import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.IdentityState;
 import org.whispersystems.signalservice.internal.storage.protos.GroupV1Record;
 import org.whispersystems.signalservice.internal.storage.protos.GroupV2Record;
-import org.whispersystems.signalservice.internal.storage.protos.StickerPackRecord;

 import java.sql.Connection;
 import java.sql.SQLException;
@ -95,12 +92,9 @@ public final class StorageSyncModels {

    public static ContactRecord localToRemoteRecord(Recipient recipient, IdentityInfo identity) {
        final var address = recipient.getAddress();
-        final var aciPresent = address.aci().isPresent();
-
        final var builder = SignalContactRecord.Companion.newBuilder(recipient.getStorageRecord())
                .e164(address.number().orElse(""))
                .username(address.username().orElse(""))
-                .pniSignatureVerified(recipient.isPniSignatureVerified())
                .profileKey(recipient.getProfileKey() == null
                        ? ByteString.EMPTY
                        : ByteString.of(recipient.getProfileKey().serialize()));
@ -123,7 +117,6 @@ public final class StorageSyncModels {
                    .nickname(getNicknameRemoteRecord(recipient.getContact()))
                    .note(emptyIfNull(recipient.getContact().note()))
                    .blocked(recipient.getContact().isBlocked())
-                    .blockedAtTimestamp(recipient.getContact().blockedAt())
                    .whitelisted(recipient.getContact().isProfileSharingEnabled())
                    .mutedUntilTimestamp(recipient.getContact().muteUntil())
                    .hideStory(recipient.getContact().hideStory())
@ -133,7 +126,7 @@ public final class StorageSyncModels {
                    .archived(recipient.getContact().isArchived())
                    .hidden(recipient.getContact().isHidden());
        }
-        if (identity != null && aciPresent) {
+        if (identity != null) {
            builder.identityKey(ByteString.of(identity.getIdentityKey().serialize()))
                    .identityState(localToRemote(identity.getTrustLevel()));
        }
@ -162,28 +155,10 @@ public final class StorageSyncModels {
        final var builder = SignalGroupV2Record.Companion.newBuilder(group.getStorageRecord());
        builder.masterKey(ByteString.of(group.getMasterKey().serialize()));
        builder.blocked(group.isBlocked());
-        builder.blockedAtTimestamp(group.getBlockedAt());
        builder.whitelisted(group.isProfileSharingEnabled());
        return builder.build();
    }

-    public static StickerPackRecord localToRemoteRecord(StickerPack stickerPack) {
-        final var builder = SignalStickerPackRecord.Companion.newBuilder(stickerPack.storageRecord());
-        builder.packId(ByteString.of(stickerPack.packId().serialize()));
-
-        if (stickerPack.deletedTimestamp() > 0) {
-            builder.packKey(ByteString.EMPTY);
-            builder.position(0);
-            builder.deletedAtTimestamp(stickerPack.deletedTimestamp());
-        } else {
-            builder.packKey(ByteString.of(stickerPack.packKey()));
-            builder.position(stickerPack.position());
-            builder.deletedAtTimestamp(0);
-        }
-
-        return builder.build();
-    }
-
    public static TrustLevel remoteToLocal(IdentityState identityState) {
        return switch (identityState) {
            case DEFAULT -> TrustLevel.TRUSTED_UNVERIFIED;
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
@ -168,11 +168,6 @@ public final class StorageSyncValidations {
                throw new DuplicateCallLinkError();
            }

-            ids = manifest.getStorageIdsByType().get(ManifestRecord.Identifier.Type.STICKER_PACK.getValue());
-            if (ids.size() != new HashSet<>(ids).size()) {
-                throw new DuplicateStickerPackError();
-            }
-
            throw new DuplicateRawIdAcrossTypesError();
        }

@ -222,8 +217,6 @@ public final class StorageSyncValidations {

    private static final class DuplicateInsertInWriteError extends Error {}

-    private static final class DuplicateStickerPackError extends Error {}
-
    private static final class InsertNotPresentInFullIdSetError extends Error {}

    private static final class DeletePresentInFullIdSetError extends Error {}
--- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
@ -1,44 +1,28 @@
 package org.asamk.signal.manager.util;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
 import org.whispersystems.signalservice.api.push.exceptions.ResumeLocationInvalidException;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec;

-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Optional;
 import java.util.UUID;

-import javax.imageio.ImageIO;
-
 public class AttachmentUtils {

-    private static final Logger logger = LoggerFactory.getLogger(AttachmentUtils.class);
-
-    // Images are fully buffered in memory to probe their dimensions, so cap how large a file we'll do this for.
-    private static final long MAX_DIMENSION_PROBE_SIZE = 20 * 1024 * 1024;
-
    public static SignalServiceAttachmentStream createAttachmentStream(
            StreamDetails streamDetails,
            Optional<String> name,
            boolean voiceNote,
            ResumableUploadSpec resumableUploadSpec
-    ) throws ResumeLocationInvalidException, IOException {
+    ) throws ResumeLocationInvalidException {
        final var uploadTimestamp = System.currentTimeMillis();
-        final var probedStream = probeImageDimensions(streamDetails);
        return SignalServiceAttachmentStream.newStreamBuilder()
-                .withStream(probedStream.inputStream())
+                .withStream(streamDetails.getStream())
                .withContentType(streamDetails.getContentType())
                .withLength(streamDetails.getLength())
                .withFileName(name.orElse(null))
                .withVoiceNote(voiceNote)
-                .withWidth(probedStream.width())
-                .withHeight(probedStream.height())
                .withUploadTimestamp(uploadTimestamp)
                .withResumableUploadSpec(resumableUploadSpec)
                .withUuid(UUID.randomUUID())
@ -49,55 +33,7 @@ public class AttachmentUtils {
            StreamDetails streamDetails,
            Optional<String> name,
            ResumableUploadSpec resumableUploadSpec
-    ) throws ResumeLocationInvalidException, IOException {
+    ) throws ResumeLocationInvalidException {
        return createAttachmentStream(streamDetails, name, false, resumableUploadSpec);
    }
-
-    /**
-     * Reads the attachment's dimensions if it's an image, so recipients don't get a square-cropped thumbnail.
-     * Falls back to width/height 0 (today's behavior) if the content isn't an image, is too large to probe
-     * cheaply, or fails to parse.
-     */
-    private static ProbedStream probeImageDimensions(StreamDetails streamDetails) throws IOException {
-        final var contentType = streamDetails.getContentType();
-        final var length = streamDetails.getLength();
-        if (contentType == null
-                || !contentType.startsWith("image/")
-                || length <= 0
-                || length > MAX_DIMENSION_PROBE_SIZE) {
-            return new ProbedStream(streamDetails.getStream(), 0, 0);
-        }
-
-        final var stream = streamDetails.getStream();
-        var width = 0;
-        var height = 0;
-        if (stream instanceof FileInputStream fis) {
-            try {
-                final var image = ImageIO.read(fis);
-                if (image != null) {
-                    width = image.getWidth();
-                    height = image.getHeight();
-                }
-                fis.getChannel().position(0);
-            } catch (IOException | LinkageError e) {
-                logger.debug("Failed to probe image dimensions, sending without width/height: {}", e.getMessage());
-                fis.getChannel().position(0);
-            }
-            return new ProbedStream(fis, width, height);
-        }
-
-        final var bytes = stream.readAllBytes();
-        try {
-            final var image = ImageIO.read(new ByteArrayInputStream(bytes));
-            if (image != null) {
-                width = image.getWidth();
-                height = image.getHeight();
-            }
-        } catch (IOException | LinkageError e) {
-            logger.debug("Failed to probe image dimensions, sending without width/height: {}", e.getMessage());
-        }
-        return new ProbedStream(new ByteArrayInputStream(bytes), width, height);
-    }
-
-    private record ProbedStream(InputStream inputStream, int width, int height) {}
 }
--- a/lib/src/main/java/org/asamk/signal/manager/util/IOUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/IOUtils.java
@ -21,19 +21,9 @@ import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
 public class IOUtils {

    public static File createTempFile() throws IOException {
-        final var prefix = "signal-cli_tmp_";
-        final var suffix = ".tmp";
-        try {
-            Set<PosixFilePermission> perms = EnumSet.of(OWNER_READ, OWNER_WRITE);
-            var path = Files.createTempFile(prefix, suffix, PosixFilePermissions.asFileAttribute(perms));
-            var tempFile = path.toFile();
-            tempFile.deleteOnExit();
-            return tempFile;
-        } catch (UnsupportedOperationException e) {
-            final var tempFile = File.createTempFile(prefix, suffix);
-            tempFile.deleteOnExit();
-            return tempFile;
-        }
+        final var tempFile = File.createTempFile("signal-cli_tmp_", ".tmp");
+        tempFile.deleteOnExit();
+        return tempFile;
    }

    public static byte[] readFully(InputStream in) throws IOException {
--- a/lib/src/main/java/org/asamk/signal/manager/util/LeakyBucket.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/LeakyBucket.java
@ -1,60 +0,0 @@
-package org.asamk.signal.manager.util;
-
-public final class LeakyBucket {
-
-    private final int capacity;
-    private final long dripIntervalMillis;
-    private final State state;
-
-    public LeakyBucket(final int capacity, final long dripIntervalMillis, final State state) {
-        this.capacity = capacity;
-        this.dripIntervalMillis = dripIntervalMillis;
-        this.state = state;
-    }
-
-    public int level(final long now) {
-        return calculateStateForCurrentTime(now).level();
-    }
-
-    public boolean hasRoom(final long now) {
-        return level(now) < capacity;
-    }
-
-    public void use(final long now) {
-        final var currentState = calculateStateForCurrentTime(now);
-        state.update(currentState.level() + 1, currentState.levelUpdatedAt());
-    }
-
-    public void refund(final long now) {
-        final var currentState = calculateStateForCurrentTime(now);
-        state.update(Math.max(currentState.level() - 1, 0), currentState.levelUpdatedAt());
-    }
-
-    public void clear() {
-        state.update(0, 0);
-    }
-
-    private Snapshot calculateStateForCurrentTime(final long now) {
-        final var level = state.level();
-        final var levelUpdatedAt = state.levelUpdatedAt();
-        final var elapsed = now - levelUpdatedAt;
-
-        if (level <= 0 || elapsed < 0) {
-            return new Snapshot(0, now);
-        }
-
-        final var drips = elapsed / dripIntervalMillis;
-        return new Snapshot((int) Math.max(level - drips, 0), levelUpdatedAt + dripIntervalMillis * drips);
-    }
-
-    private record Snapshot(int level, long levelUpdatedAt) {}
-
-    public interface State {
-
-        int level();
-
-        long levelUpdatedAt();
-
-        void update(int level, long levelUpdatedAt);
-    }
-}
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@ -10,11 +10,11 @@ import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.asamk.signal.manager.helper.PinHelper;
 import org.signal.core.models.MasterKey;
-import org.signal.network.exceptions.NonSuccessfulResponseCodeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.exceptions.ChallengeRequiredException;
 import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException;
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 import org.whispersystems.signalservice.api.push.exceptions.TokenNotAcceptedException;
 import org.whispersystems.signalservice.api.registration.RegistrationApi;
 import org.whispersystems.signalservice.internal.push.LockedException;
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@ -7,9 +7,9 @@ import org.signal.libsignal.net.RequestResult;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.fingerprint.Fingerprint;
 import org.signal.libsignal.protocol.fingerprint.NumericFingerprintGenerator;
-import org.signal.network.NetworkResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.NetworkResult;
 import org.whispersystems.signalservice.api.NetworkResultUtil;
 import org.whispersystems.signalservice.api.util.StreamDetails;

@ -17,6 +17,7 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigInteger;
 import java.net.Proxy;
 import java.net.ProxySelector;
@ -38,9 +39,6 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;

-import kotlin.coroutines.Continuation;
-import kotlin.coroutines.EmptyCoroutineContext;
-import kotlinx.coroutines.BuildersKt;
 import okio.ByteString;

 public class Utils {
@ -55,7 +53,7 @@ public class Utils {
    }

    public static StreamDetails createStreamDetailsFromFile(final File file) throws IOException {
-        final var stream = new FileInputStream(file);
+        final InputStream stream = new FileInputStream(file);
        final var size = file.length();
        final var mime = MimeUtils.getFileMimeType(file).orElse(MimeUtils.OCTET_STREAM);
        return new StreamDetails(stream, mime, size);
@ -163,24 +161,6 @@ public class Utils {
        return NetworkResultUtil.toBasicLegacy(response);
    }

-    @SuppressWarnings("unchecked")
-    public static <T> T runSuspendBlocking(final Function<Continuation<? super T>, Object> call) {
-        try {
-            return (T) BuildersKt.runBlocking(EmptyCoroutineContext.INSTANCE,
-                    (scope, cont) -> call.apply((Continuation<? super T>) cont));
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RuntimeException("Interrupted while waiting for suspend function", e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T, E extends BadRequestError> T handleResponseExceptionSuspend(
-            final Function<Continuation<? super RequestResult>, Object> call
-    ) throws IOException {
-        return handleResponseException((RequestResult<T, E>) runSuspendBlocking((Function) call));
-    }
-
    @SuppressWarnings("unchecked")
    public static <T, E extends BadRequestError> T handleResponseException(final RequestResult<T, E> result) throws IOException {
        if (result instanceof RequestResult.Success<?> success) {
--- a/lib/src/test/java/org/asamk/signal/manager/storage/groups/GroupInfoTerminatedTest.java
+++ b/lib/src/test/java/org/asamk/signal/manager/storage/groups/GroupInfoTerminatedTest.java
@ -1,104 +0,0 @@
-package org.asamk.signal.manager.storage.groups;
-
-import org.asamk.signal.manager.api.Group;
-import org.asamk.signal.manager.api.GroupId;
-import org.asamk.signal.manager.groups.GroupUtils;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.asamk.signal.manager.storage.recipients.RecipientResolver;
-import org.asamk.signal.manager.storage.recipients.TestRecipientId;
-import org.junit.jupiter.api.Test;
-import org.signal.core.models.ServiceId;
-import org.signal.libsignal.zkgroup.InvalidInputException;
-import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
-import org.signal.storageservice.storage.protos.groups.local.DecryptedGroup;
-import org.whispersystems.signalservice.api.push.DistributionId;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class GroupInfoTerminatedTest {
-
-    private static final RecipientResolver UNUSED_RESOLVER = new RecipientResolver() {
-        @Override
-        public RecipientId resolveRecipient(final RecipientAddress address) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public RecipientId resolveRecipient(final long recipientId) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public RecipientId resolveRecipient(final String identifier) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public RecipientId resolveRecipient(final ServiceId serviceId) {
-            throw new UnsupportedOperationException();
-        }
-    };
-
-    private static GroupMasterKey masterKey() {
-        final var bytes = new byte[32];
-        for (int i = 0; i < bytes.length; i++) {
-            bytes[i] = (byte) (i + 1);
-        }
-        try {
-            return new GroupMasterKey(bytes);
-        } catch (InvalidInputException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    private static GroupInfoV2 groupV2(final DecryptedGroup group) {
-        final var masterKey = masterKey();
-        return new GroupInfoV2(GroupUtils.getGroupIdV2(masterKey),
-                masterKey,
-                group,
-                DistributionId.create(),
-                false,
-                0,
-                false,
-                false,
-                null,
-                UNUSED_RESOLVER);
-    }
-
-    @Test
-    void v1GroupsAreNeverTerminated() {
-        final var group = new GroupInfoV1(GroupId.v1(new byte[16]));
-        assertFalse(group.isTerminated());
-    }
-
-    @Test
-    void v2ReadsTerminatedFlagFromDecryptedGroup() {
-        assertTrue(groupV2(new DecryptedGroup.Builder().terminated(true).build()).isTerminated());
-        assertFalse(groupV2(new DecryptedGroup.Builder().terminated(false).build()).isTerminated());
-        assertFalse(groupV2(new DecryptedGroup.Builder().build()).isTerminated());
-    }
-
-    @Test
-    void v2IsNotTerminatedWhenGroupStateMissing() {
-        final var masterKey = masterKey();
-        final var group = new GroupInfoV2(GroupUtils.getGroupIdV2(masterKey), masterKey, UNUSED_RESOLVER);
-        assertFalse(group.isTerminated());
-    }
-
-    @Test
-    void groupApiRecordCarriesTerminatedFromModel() {
-        final RecipientId self = TestRecipientId.createTestId(1);
-
-        final var terminated = Group.from(groupV2(new DecryptedGroup.Builder().terminated(true).build()),
-                recipientId -> null,
-                self);
-        assertTrue(terminated.isTerminated());
-
-        final var live = Group.from(groupV2(new DecryptedGroup.Builder().terminated(false).build()),
-                recipientId -> null,
-                self);
-        assertFalse(live.isTerminated());
-    }
-}
--- a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/RecipientStoreTest.java
+++ b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/RecipientStoreTest.java
@ -1,93 +0,0 @@
-package org.asamk.signal.manager.storage.recipients;
-
-import org.asamk.signal.manager.api.Contact;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class RecipientStoreTest {
-
-    @Test
-    void mergeContactsUsesAndroidMergePolicy() {
-        final var primary = Contact.newBuilder()
-                .withGivenName("Primary given")
-                .withFamilyName("Primary family")
-                .withNickName("Primary system nickname")
-                .withNickNameGivenName("Primary nickname given")
-                .withNickNameFamilyName("Primary nickname family")
-                .withNote("Primary note")
-                .withColor("Primary color")
-                .withMessageExpirationTimeVersion(2)
-                .withHideStory(true)
-                .withIsBlocked(false)
-                .withBlockedAt(100)
-                .withIsArchived(true)
-                .withIsHidden(true)
-                .withUnregisteredTimestamp(300L)
-                .build();
-        final var secondary = Contact.newBuilder()
-                .withGivenName("Secondary given")
-                .withFamilyName("Secondary family")
-                .withNickName("Secondary system nickname")
-                .withNickNameGivenName("Secondary nickname given")
-                .withNickNameFamilyName("Secondary nickname family")
-                .withNote("Secondary note")
-                .withColor("Secondary color")
-                .withMessageExpirationTime(60)
-                .withMessageExpirationTimeVersion(3)
-                .withMuteUntil(400)
-                .withIsBlocked(true)
-                .withBlockedAt(200)
-                .withIsProfileSharingEnabled(true)
-                .withIsHidden(true)
-                .withUnregisteredTimestamp(500L)
-                .build();
-
-        final var merged = RecipientStore.mergeContacts(primary, secondary);
-
-        assertEquals("Secondary given", merged.givenName());
-        assertEquals("Secondary family", merged.familyName());
-        assertEquals("Primary system nickname", merged.nickName());
-        assertEquals("Primary nickname given", merged.nickNameGivenName());
-        assertEquals("Primary nickname family", merged.nickNameFamilyName());
-        assertEquals("Primary note", merged.note());
-        assertEquals("Primary color", merged.color());
-        assertEquals(60, merged.messageExpirationTime());
-        assertEquals(3, merged.messageExpirationTimeVersion());
-        assertEquals(400, merged.muteUntil());
-        assertTrue(merged.hideStory());
-        assertTrue(merged.isBlocked());
-        assertEquals(200, merged.blockedAt());
-        assertTrue(merged.isArchived());
-        assertTrue(merged.isProfileSharingEnabled());
-        assertFalse(merged.isHidden());
-        assertEquals(300L, merged.unregisteredTimestamp());
-    }
-
-    @Test
-    void mergeContactsPrefersConfiguredPrimaryValues() {
-        final var primary = Contact.newBuilder()
-                .withColor("Primary color")
-                .withMessageExpirationTime(30)
-                .withMessageExpirationTimeVersion(4)
-                .withMuteUntil(100)
-                .withIsHidden(true)
-                .build();
-        final var secondary = Contact.newBuilder()
-                .withColor("Secondary color")
-                .withMessageExpirationTime(60)
-                .withMessageExpirationTimeVersion(3)
-                .withMuteUntil(200)
-                .build();
-
-        final var merged = RecipientStore.mergeContacts(primary, secondary);
-
-        assertEquals("Primary color", merged.color());
-        assertEquals(30, merged.messageExpirationTime());
-        assertEquals(4, merged.messageExpirationTimeVersion());
-        assertEquals(100, merged.muteUntil());
-        assertTrue(merged.isHidden());
-    }
-}
--- a/lib/src/test/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessorTest.java
+++ b/lib/src/test/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessorTest.java
@ -1,33 +0,0 @@
-package org.asamk.signal.manager.syncStorage;
-
-import org.junit.jupiter.api.Test;
-import org.signal.core.models.ServiceId.ACI;
-import org.signal.core.models.ServiceId.PNI;
-
-import java.util.UUID;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class StorageRecordProcessorTest {
-
-    @Test
-    void splitsOnlyUnregisteredAciOnlyRecords() {
-        final var aci = ACI.from(UUID.randomUUID());
-        final var pni = PNI.from(UUID.randomUUID());
-
-        assertTrue(ContactRecordProcessor.shouldSplitForStorageSync(1, aci, null, ""));
-        assertFalse(ContactRecordProcessor.shouldSplitForStorageSync(0, aci, null, ""));
-        assertFalse(ContactRecordProcessor.shouldSplitForStorageSync(1, null, null, ""));
-        assertFalse(ContactRecordProcessor.shouldSplitForStorageSync(1, aci, pni, ""));
-        assertFalse(ContactRecordProcessor.shouldSplitForStorageSync(1, aci, null, "+12025550123"));
-    }
-
-    @Test
-    void keepsOlderLocalStickerDeletion() {
-        assertTrue(StickerPackRecordProcessor.shouldKeepLocalDeletion(200, 100));
-        assertFalse(StickerPackRecordProcessor.shouldKeepLocalDeletion(100, 200));
-        assertFalse(StickerPackRecordProcessor.shouldKeepLocalDeletion(200, 0));
-        assertFalse(StickerPackRecordProcessor.shouldKeepLocalDeletion(0, 100));
-    }
-}
--- a/lib/src/test/java/org/asamk/signal/manager/syncStorage/StorageSyncLoopDetectorTest.java
+++ b/lib/src/test/java/org/asamk/signal/manager/syncStorage/StorageSyncLoopDetectorTest.java
@ -1,102 +0,0 @@
-package org.asamk.signal.manager.syncStorage;
-
-import org.junit.jupiter.api.Test;
-import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
-import org.whispersystems.signalservice.api.storage.StorageId;
-import org.whispersystems.signalservice.internal.storage.protos.StorageRecord;
-
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-
-class StorageSyncLoopDetectorTest {
-
-    private static final long NOW = 1_700_000_000_000L;
-
-    @Test
-    void repeatedPayloadIsDeniedAfterThreeCharges() {
-        final var detector = new StorageSyncLoopDetector(() -> true);
-        final var write = writeWithInsert(1);
-
-        assertAllowed(detector.onWriteAttempt(write, true, false, NOW));
-        for (var index = 0; index < 3; index++) {
-            assertAllowed(detector.onWriteAttempt(write, true, false, NOW));
-        }
-
-        assertEquals(new StorageSyncLoopDetector.Decision.Denied(StorageSyncLoopDetector.Cause.REPEATED_PAYLOAD, 3),
-                detector.onWriteAttempt(write, true, false, NOW));
-    }
-
-    @Test
-    void storageIdsAreExcludedFromPayloadFingerprint() {
-        final var detector = new StorageSyncLoopDetector(() -> true);
-
-        assertAllowed(detector.onWriteAttempt(writeWithInsert(1), true, false, NOW));
-        assertAllowed(detector.onWriteAttempt(writeWithInsert(2), true, false, NOW));
-        assertAllowed(detector.onWriteAttempt(writeWithInsert(3), true, false, NOW));
-        assertAllowed(detector.onWriteAttempt(writeWithInsert(4), true, false, NOW));
-
-        assertInstanceOf(StorageSyncLoopDetector.Decision.Denied.class,
-                detector.onWriteAttempt(writeWithInsert(5), true, false, NOW));
-    }
-
-    @Test
-    void convergenceClearsTheContentBucket() {
-        final var detector = new StorageSyncLoopDetector(() -> true);
-        final var write = writeWithInsert(1);
-        for (var index = 0; index < 4; index++) {
-            assertAllowed(detector.onWriteAttempt(write, true, false, NOW));
-        }
-
-        detector.onConverged();
-
-        assertAllowed(detector.onWriteAttempt(write, true, false, NOW));
-    }
-
-    @Test
-    void failedWritesAreRefunded() {
-        final var detector = new StorageSyncLoopDetector(() -> true);
-        final var write = writeWithInsert(1);
-
-        for (var index = 0; index < 20; index++) {
-            assertAllowed(detector.onWriteAttempt(write, true, false, NOW));
-            detector.onWriteFailed(NOW);
-        }
-    }
-
-    @Test
-    void rateBucketLimitsDeleteOnlyWrites() {
-        final var detector = new StorageSyncLoopDetector(() -> true);
-        final var write = new WriteOperationResult(null, List.of(), List.of(new byte[]{1}));
-
-        for (var index = 0; index < 100; index++) {
-            assertAllowed(detector.onWriteAttempt(write, true, false, NOW));
-        }
-
-        assertEquals(new StorageSyncLoopDetector.Decision.Denied(StorageSyncLoopDetector.Cause.WRITE_RATE, 100),
-                detector.onWriteAttempt(write, true, false, NOW));
-    }
-
-    @Test
-    void retriesAndSingleDeviceWritesAreExempt() {
-        final var retryDetector = new StorageSyncLoopDetector(() -> true);
-        final var singleDeviceDetector = new StorageSyncLoopDetector(() -> false);
-        final var write = writeWithInsert(1);
-
-        for (var index = 0; index < 20; index++) {
-            assertAllowed(retryDetector.onWriteAttempt(write, true, true, NOW));
-            assertAllowed(singleDeviceDetector.onWriteAttempt(write, true, false, NOW));
-        }
-    }
-
-    private static WriteOperationResult writeWithInsert(final int storageIdByte) {
-        final var storageId = StorageId.forType(new byte[]{(byte) storageIdByte}, 99);
-        final var record = new SignalStorageRecord(storageId, new StorageRecord.Builder().build());
-        return new WriteOperationResult(null, List.of(record), List.of());
-    }
-
-    private static void assertAllowed(final StorageSyncLoopDetector.Decision decision) {
-        assertEquals(StorageSyncLoopDetector.Decision.Allowed.INSTANCE, decision);
-    }
-}
--- a/lib/src/test/java/org/asamk/signal/manager/util/AttachmentUtilsTest.java
+++ b/lib/src/test/java/org/asamk/signal/manager/util/AttachmentUtilsTest.java
@ -1,52 +0,0 @@
-package org.asamk.signal.manager.util;
-
-import org.junit.jupiter.api.Test;
-import org.whispersystems.signalservice.api.util.StreamDetails;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.Optional;
-
-import javax.imageio.ImageIO;
-
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class AttachmentUtilsTest {
-
-    @Test
-    public void createAttachmentStream_setsWidthAndHeightForImage() throws Exception {
-        final var imageBytes = pngBytes(37, 21);
-        final var streamDetails = new StreamDetails(new ByteArrayInputStream(imageBytes),
-                "image/png",
-                imageBytes.length);
-
-        final var attachment = AttachmentUtils.createAttachmentStream(streamDetails, Optional.of("meme.png"), null);
-
-        assertEquals(37, attachment.getWidth());
-        assertEquals(21, attachment.getHeight());
-        assertArrayEquals(imageBytes, attachment.getInputStream().readAllBytes());
-    }
-
-    @Test
-    public void createAttachmentStream_leavesWidthAndHeightZeroForNonImage() throws Exception {
-        final var bytes = "not an image".getBytes();
-        final var streamDetails = new StreamDetails(new ByteArrayInputStream(bytes),
-                "application/octet-stream",
-                bytes.length);
-
-        final var attachment = AttachmentUtils.createAttachmentStream(streamDetails, Optional.of("file.bin"), null);
-
-        assertEquals(0, attachment.getWidth());
-        assertEquals(0, attachment.getHeight());
-        assertArrayEquals(bytes, attachment.getInputStream().readAllBytes());
-    }
-
-    private static byte[] pngBytes(final int width, final int height) throws Exception {
-        final var image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-        final var out = new ByteArrayOutputStream();
-        ImageIO.write(image, "png", out);
-        return out.toByteArray();
-    }
-}
--- a/lib/src/test/java/org/asamk/signal/manager/util/LeakyBucketTest.java
+++ b/lib/src/test/java/org/asamk/signal/manager/util/LeakyBucketTest.java
@ -1,66 +0,0 @@
-package org.asamk.signal.manager.util;
-
-import org.junit.jupiter.api.Test;
-
-import java.time.Duration;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class LeakyBucketTest {
-
-    private static final long NOW = 1_700_000_000_000L;
-
-    @Test
-    void dripsLevelsAndCarriesPartialIntervals() {
-        final var state = new TestState();
-        final var bucket = new LeakyBucket(3, Duration.ofHours(1).toMillis(), state);
-
-        bucket.use(NOW);
-        bucket.use(NOW);
-        bucket.use(NOW);
-
-        assertEquals(2, bucket.level(NOW + Duration.ofMinutes(90).toMillis()));
-        assertEquals(1, bucket.level(NOW + Duration.ofMinutes(121).toMillis()));
-    }
-
-    @Test
-    void refundNeverDropsBelowZero() {
-        final var bucket = new LeakyBucket(1, 1_000, new TestState());
-
-        bucket.refund(NOW);
-
-        assertEquals(0, bucket.level(NOW));
-        assertTrue(bucket.hasRoom(NOW));
-    }
-
-    @Test
-    void clockMovingBackwardsRefillsTheBucket() {
-        final var bucket = new LeakyBucket(1, 1_000, new TestState());
-        bucket.use(NOW);
-
-        assertTrue(bucket.hasRoom(NOW - 1));
-    }
-
-    private static final class TestState implements LeakyBucket.State {
-
-        private int level;
-        private long levelUpdatedAt;
-
-        @Override
-        public int level() {
-            return level;
-        }
-
-        @Override
-        public long levelUpdatedAt() {
-            return levelUpdatedAt;
-        }
-
-        @Override
-        public void update(final int level, final long levelUpdatedAt) {
-            this.level = level;
-            this.levelUpdatedAt = levelUpdatedAt;
-        }
-    }
-}
--- a/2
+++ b/2
@ -1 +1 @@
-0.99.1
+0.92.1
--- a/man/signal-cli-dbus.5.adoc
+++ b/man/signal-cli-dbus.5.adoc
@ -13,7 +13,7 @@ signal-cli-dbus - A commandline and dbus interface for the Signal messenger

 == Synopsis

-*signal-cli* [--verbose] [--data-dir DATA_DIR] [-a ACCOUNT] [-o {plain-text,json}] daemon [--dbus] [--dbus-system]
+*signal-cli* [--verbose] [--config CONFIG] [-a ACCOUNT] [-o {plain-text,json}] daemon [--dbus] [--dbus-system]

 *dbus-send* [--system | --session] [--print-reply] --type=method_call --dest="org.asamk.Signal" /org/asamk/Signal[/_<phonenumber>] org.asamk.Signal.<method> [string:<string argument>] [array:<type>:<array argument>]

@ -452,7 +452,6 @@ Groups have the following (case-sensitive) properties:
 * IsBlocked<b> : true=member will not receive group messages; false=not blocked
 * IsMember<b> (read-only) : always true (object path exists only for group members)
 * IsAdmin<b> (read-only) : true=member has admin privileges; false=not admin
-* IsTerminated<b> (read-only) : true=group was permanently ended by an admin; nobody (not even an admin) can send messages or start calls, sending is rejected locally
 * MessageExpirationTimer<i> : int32 representing message expiration time for group
 * Members<as> (read-only) : String array of group members' phone numbers
 * PendingMembers<as> (read-only) : String array of pending members' phone numbers
@ -503,11 +502,6 @@ Exceptions: Failure
 quitGroup() -> <>::
 Exceptions: Failure, LastGroupAdmin

-terminateGroup() -> <>::
-Permanently terminate the group for all members (requires admin privileges). Afterwards nobody can send messages or start calls; members keep access to the existing history.
-
-Exceptions: Failure
-
 removeAdmins(recipients<as>) -> <>::
 * recipients : String array of phone numbers

--- a/man/signal-cli-jsonrpc.5.adoc
+++ b/man/signal-cli-jsonrpc.5.adoc
@ -13,9 +13,9 @@ signal-cli-jsonrpc - A commandline and dbus interface for the Signal messenger

 == Synopsis

-*signal-cli* [--verbose] [--data-dir DATA_DIR] [-a ACCOUNT] daemon [--socket[=SOCKET_PATH]] [--tcp[=HOST:PORT]] [--http[=HOST:PORT]]
+*signal-cli* [--verbose] [--config CONFIG] [-a ACCOUNT] daemon [--socket[=SOCKET_PATH]] [--tcp[=HOST:PORT]] [--http[=HOST:PORT]]

-*signal-cli* [--verbose] [--data-dir DATA_DIR] [-a ACCOUNT] jsonRpc
+*signal-cli* [--verbose] [--config CONFIG] [-a ACCOUNT] jsonRpc

 == Description

--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@ -13,7 +13,7 @@ signal-cli - A commandline interface for the Signal messenger

 == Synopsis

-*signal-cli* [--data-dir DATA_DIR] [-h | -v | -a ACCOUNT | --dbus | --dbus-system] command [command-options]
+*signal-cli* [--config CONFIG] [-h | -v | -a ACCOUNT | --dbus | --dbus-system] command [command-options]

 == Description

@ -57,8 +57,8 @@ If `--verbose` is also given, the detailed logs will only be written to the log
 Scrub possibly sensitive information from the log, like phone numbers and UUIDs.
 Doesn't work reliably on dbus logs with very verbose logging (`-vvv`)

-*-d* DATA_DIR, *--data-dir* DATA_DIR, *-c* CONFIG, *--config* CONFIG::
-Set the path where to store account data and local configuration.
+*--config* CONFIG::
+Set the path, where to store the config.
 Make sure you have full read/write access to the given directory.
 (Default: `$XDG_DATA_HOME/signal-cli` (`$HOME/.local/share/signal-cli`))

@ -632,20 +632,6 @@ Specify the timestamp of the message to which to react.
 *--type* TYPE::
 Specify the receipt type, either `read` (the default) or `viewed`.

-=== sendStory
-
-Post a file attachment story to your Story, visible to all contacts.
-
-*-a* ATTACHMENT, *--attachment* ATTACHMENT::
-Specify the file path to the image or video to post as a story.
-
-*-g* GROUP, *--group-id* GROUP::
-Specify a group to post the story to.
-Without this flag, the story is posted to "My Story".
-
-*--no-replies*::
-Disable replies on this story. By default, replies are allowed.
-
 === sendTyping

 Send typing message to trigger a typing indicator for the recipient.
@ -786,16 +772,6 @@ Specify the recipient group ID in base64 encoding.
 *--delete*::
 Delete local group data completely after quitting group.

-=== terminateGroup
-
-Permanently terminate a group for all members.
-This requires admin privileges.
-Afterwards no member (not even an admin) can send messages or start calls in the group; members keep access to the existing message history.
-Only supported for Signal group v2 groups.
-
-*-g* GROUP, *--group-id* GROUP::
-Specify the group ID in base64 encoding.
-
 === listGroups

 Show a list of known groups and related information.
@ -1196,25 +1172,10 @@ signal-cli -a ACCOUNT trust -a RECIPIENT

 == Files

-The password and cryptographic keys are created when registering and stored in the current users home directory, the directory can be changed with *--data-dir* (legacy *--config*):
+The password and cryptographic keys are created when registering and stored in the current users home directory, the directory can be changed with *--config*:

 `$XDG_DATA_HOME/signal-cli/` (`$HOME/.local/share/signal-cli/`)

-=== Configuration file
-
-signal-cli supports a JSON-based global configuration file that provides defaults for CLI options.
-Keys use camelCase and generally match the long CLI parameter names (for example `dataDir`, `verbose`, `logFile`, `serviceEnvironment`, `trustNewIdentities`, `output`, `disableSendLog`, `account`).
-
-Configuration files are read and merged in this order; later files override earlier ones:
-
- `/etc/signal-cli/config.json` (system-wide defaults)
- the path in the `SIGNAL_CLI_CONFIG` environment variable (if set)
- `$XDG_CONFIG_HOME/signal-cli/config.json` (per-user; defaults to `$HOME/.config/signal-cli/config.json`)
-
-When multiple configuration files are present their settings are merged; values from later files override earlier values.
-Command-line options always take precedence over configuration file values.
-Overall precedence (highest → lowest): command-line options → per-user config → system config → built-in defaults.
-
 == Authors

 Maintained by AsamK <asamk@gmx.de>, who is assisted by other open source contributors.
--- a/reproducible-builds/build.Containerfile
+++ b/reproducible-builds/build.Containerfile
@ -6,7 +6,7 @@ ENV SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH
 ENV LANG=C.UTF-8
 ENV LC_CTYPE=en_US.UTF-8
 RUN SNAPSHOT="$(date -u -d "@$SOURCE_DATE_EPOCH" +%Y%m%dT%H%M%SZ)" \
-    && sed -i 's/^deb /deb [snapshot=yes] /' /etc/apt/sources.list && apt update --snapshot "$SNAPSHOT" && apt install -y make asciidoc-base --snapshot "$SNAPSHOT" --no-install-recommends --no-install-suggests
+    && apt install -y make asciidoc-base --update --snapshot "$SNAPSHOT" --no-install-recommends --no-install-suggests
 COPY --chmod=0700 reproducible-builds/entrypoint.sh /usr/local/bin/entrypoint.sh
 WORKDIR /signal-cli
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh", "build" ]
--- a/reproducible-builds/build.sh
+++ b/reproducible-builds/build.sh
@ -18,13 +18,12 @@ fi
 VERSION=$(sed -n 's/\s*version\s*=\s*"\(.*\)".*/\1/p' build.gradle.kts | tail -n1)
 echo "$VERSION" >dist/VERSION

-# Build jar and schemas
+# Build jar
 $ENGINE build -t signal-cli:build ${OVERRIDE_JAVA_VERSION:+--build-arg ZULU_TAG=$OVERRIDE_JAVA_VERSION} -f reproducible-builds/build.Containerfile .
 git clean -Xfd -e '!/dist/' -e '!/dist/**' -e '!/github/' -e '!/github/**'
 # shellcheck disable=SC2086
 $ENGINE run --pull=never --rm -v "$(pwd)":/signal-cli:Z -e VERSION="$VERSION" $USER signal-cli:build
 mv build/distributions/signal-cli-*.tar.gz dist/
-mv build/signal-cli-*-json-schemas.tar.gz dist/

 if [ -n "${OVERRIDE_JAVA_VERSION:-}" ]; then
 	echo -e "\e[33mBuild was performed with overridden Java version $OVERRIDE_JAVA_VERSION, native-image and client will not be built.\e[0m"
--- a/reproducible-builds/entrypoint.sh
+++ b/reproducible-builds/entrypoint.sh
@ -12,7 +12,7 @@ reset_file_dates

 if [ "$1" == "build" ]; then

-	./gradlew build jsonSchemas \
+	./gradlew build \
 		--no-daemon \
 		--max-workers=1 \
 		-Dkotlin.compiler.execution.strategy=in-process \
@ -20,12 +20,6 @@ if [ "$1" == "build" ]; then
 		-Dorg.gradle.caching=false \
 		-Porg.gradle.java.installations.auto-download=false \
 		-Porg.gradle.java.installations.auto-detect=false
-	
-	schemas_tar="build/signal-cli-${VERSION}-json-schemas.tar"
-	reset_file_dates
-	tar --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --numeric-owner -cf "$schemas_tar" -C build/generated/META-INF/schemas .
-	gzip -n -9 "$schemas_tar"
-
 	cd man
 	make install
 	cd ..
--- a/run_tests.sh
+++ b/run_tests.sh
@ -38,13 +38,6 @@ else
 	SIGNAL_CLI="$PWD/build/install/signal-cli/bin/signal-cli"
 fi

-# Prefer line-buffered output for external commands when available
-if command -v stdbuf >/dev/null 2>&1; then
-  STD_BUF="stdbuf -oL -eL --"
-else
-  STD_BUF=""
-fi
-
 run() {
  # To update graalvm config, set GRAALVM_HOME, e.g:
  # export GRAALVM_HOME=/usr/lib/jvm/java-25-graalvm
@ -55,23 +48,11 @@ run() {

  set -x
  if [ "$JSON_RPC" -eq 1 ]; then
-    if [ -n "$STD_BUF" ]; then
-      $STD_BUF "$SIGNAL_CLI" $@
-    else
-      "$SIGNAL_CLI" $@
-    fi
+    "$SIGNAL_CLI" $@
  elif [ "$DBUS" -eq 1 ]; then
-    if [ -n "$STD_BUF" ]; then
-      $STD_BUF "$SIGNAL_CLI" --dbus --verbose --verbose $@ > >(grep --line-buffered -v 'Warning:' | grep --line-buffered -v 'at org' || true)
-    else
-      "$SIGNAL_CLI" --dbus --verbose --verbose $@ > >(grep --line-buffered -v 'Warning:' | grep --line-buffered -v 'at org' || true)
-    fi
+    "$SIGNAL_CLI" --dbus --verbose --verbose $@ | grep -v 'Warning:' | grep -v 'at org'
  else
-    if [ -n "$STD_BUF" ]; then
-      $STD_BUF "$SIGNAL_CLI" --service-environment="staging" --verbose --verbose $@ > >(grep --line-buffered -v 'Warning:' | grep --line-buffered -v 'at org' || true)
-    else
-      "$SIGNAL_CLI" --service-environment="staging" --verbose --verbose $@ > >(grep --line-buffered -v 'Warning:' | grep --line-buffered -v 'at org' || true)
-    fi
+    "$SIGNAL_CLI" --service-environment="staging" --verbose --verbose $@ | grep -v 'Warning:' | grep -v 'at org'
  fi
  set +x
 }
@ -117,10 +98,9 @@ link() {
  rm -f "$LINK_CODE_FILE"
  mkfifo "$LINK_CODE_FILE"
  run_linked link -n "test-device" >"$LINK_CODE_FILE" &
-  LINK_PID=$!
-  read -r LINK_CODE <"$LINK_CODE_FILE"
+  read LINK_CODE <"$LINK_CODE_FILE"
  run_main -a "$NUMBER" addDevice --uri "$LINK_CODE"
-  wait $LINK_PID
+  wait
  run_linked -a "$NUMBER" send --note-to-self -m hi
  run_main -a "$NUMBER" receive
  run_linked -a "$NUMBER" receive
@ -200,7 +180,6 @@ run_main -a "$NUMBER_2" updateContact "$NUMBER_1" -n NUMBER_1 -e 10
 run_main -a "$NUMBER_2" block "$NUMBER_1"
 run_main -a "$NUMBER_2" unblock "$NUMBER_1"
 run_main -a "$NUMBER_2" listContacts
-run_main -a "$NUMBER_2" listContacts "$NUMBER_1"

 run_main -a "$NUMBER_1" send "$NUMBER_2" -m hi
 run_main -a "$NUMBER_2" receive
@ -213,7 +192,6 @@ run_main -a "$NUMBER_2" send "$NUMBER_1" -m hi
 run_main -a "$NUMBER_2" send "$NUMBER_1" -m hii
 run_main -a "$NUMBER_1" updateAccount --discoverable-by-number=false
 run_main -a "$NUMBER_1" receive
-run_main -a "$NUMBER_1" send "$NUMBER_2" -m hi
 run_main -a "$NUMBER_2" receive
 run_main -a "$NUMBER_2" send "$NUMBER_1" -m hi
 run_main -a "$NUMBER_2" send "$NUMBER_1" -m hii
@ -229,7 +207,6 @@ run_main -a "$NUMBER_1" updateGroup -g "$GROUP_ID" -m "$NUMBER_2"
 run_main -a "$NUMBER_1" listGroups -d
 run_main -a "$NUMBER_1" --output=json listGroups -d
 run_main -a "$NUMBER_2" receive
-run_main -a "$NUMBER_2" listGroups -g "$GROUP_ID"
 run_main -a "$NUMBER_2" quitGroup -g "$GROUP_ID"
 run_main -a "$NUMBER_2" listGroups -d
 run_main -a "$NUMBER_2" --output=json listGroups -d
@ -251,7 +228,6 @@ for OUTPUT in "plain-text" "json"; do
  run_main -a "$NUMBER_2" --output="$OUTPUT" receive
  run_main -a "$NUMBER_1" --output="$OUTPUT" receive
  run_main -a "$NUMBER_1" --output="$OUTPUT" send -e "$NUMBER_2"
-  run_main -a "$NUMBER_1" --output="$OUTPUT" send "$NUMBER_2" -m test
  run_main -a "$NUMBER_2" --output="$OUTPUT" receive
 done

@ -259,8 +235,8 @@ done
 run_main -a "$NUMBER_1" updateProfile --given-name=GIVEN --family-name=FAMILY --about=ABOUT --about-emoji=EMOJI --avatar=LICENSE --mobile-coin-address="YWJjCg=="

 ## Provisioning
-link "$NUMBER_1" || true
-link "$NUMBER_2" || true
+link "$NUMBER_1"
+link "$NUMBER_2"
 run_main -a "$NUMBER_1" listDevices
 run_linked -a "$NUMBER_1" sendSyncRequest
 run_main -a "$NUMBER_1" sendContacts
@ -295,7 +271,6 @@ fi
 run_main -a "$NUMBER_2" deleteLocalAccountData || true

 if [ ! -z "$GRAALVM_HOME" ]; then
-  NATIVE_IMAGE_UTILS="$GRAALVM_HOME/lib/svm/bin/native-image-utils"
-  "$NATIVE_IMAGE_UTILS" generate --input-dir=src/main/resources/META-INF/native-image/org.asamk/signal-cli/ --input-dir=graalvm-config-dir-linked/ --input-dir=graalvm-config-dir-main/ --output-dir=src/main/resources/META-INF/native-image/org.asamk/signal-cli/
+  "$GRAALVM_HOME"/lib/svm/bin/native-image-configure generate --input-dir=src/main/resources/META-INF/native-image/org.asamk/signal-cli/ --input-dir=graalvm-config-dir-linked/ --input-dir=graalvm-config-dir-main/ --output-dir=src/main/resources/META-INF/native-image/org.asamk/signal-cli/
  rm -r graalvm-config-dir-main graalvm-config-dir-linked
 fi
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@ -22,8 +22,6 @@ public interface Signal extends DBusInterface {

    String getSelfNumber();

-    String getSelfACI();
-
    void subscribeReceive();

    void unsubscribeReceive();
@ -595,7 +593,6 @@ public interface Signal extends DBusInterface {
    @DBusProperty(name = "IsBlocked", type = Boolean.class)
    @DBusProperty(name = "IsMember", type = Boolean.class, access = DBusProperty.Access.READ)
    @DBusProperty(name = "IsAdmin", type = Boolean.class, access = DBusProperty.Access.READ)
-    @DBusProperty(name = "IsTerminated", type = Boolean.class, access = DBusProperty.Access.READ)
    @DBusProperty(name = "MessageExpirationTimer", type = Integer.class)
    @DBusProperty(name = "Members", type = String[].class, access = DBusProperty.Access.READ)
    @DBusProperty(name = "PendingMembers", type = String[].class, access = DBusProperty.Access.READ)
@ -612,8 +609,6 @@ public interface Signal extends DBusInterface {

        void deleteGroup() throws Error.Failure;

-        void terminateGroup() throws Error.Failure;
-
        void addMembers(List<String> recipients) throws Error.Failure;

        void removeMembers(List<String> recipients) throws Error.Failure;
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@ -46,9 +46,7 @@ public class App {

    private final Namespace ns;

-    static ArgumentParser buildArgumentParser(GlobalConfig config) {
-        final var cfg = config == null ? GlobalConfig.DEFAULT : config;
-
+    static ArgumentParser buildArgumentParser() {
        var parser = ArgumentParsers.newFor("signal-cli", VERSION_0_9_0_DEFAULT_SETTINGS)
                .includeArgumentNamesAsKeysInResult(true)
                .build()
@ -59,60 +57,47 @@ public class App {
        parser.addArgument("--version").help("Show package version.").action(Arguments.version());
        parser.addArgument("-v", "--verbose")
                .help("Raise log level and include lib signal logs. Specify multiple times for even more logs.")
-                .action(Arguments.count())
-                .setDefault(cfg.verbose() == null ? 0 : cfg.verbose());
+                .action(Arguments.count());
        parser.addArgument("--log-file")
                .type(File.class)
-                .help("Write log output to the given file. If --verbose is also given, the detailed logs will only be written to the log file.")
-                .setDefault(cfg.logFile() == null ? null : new File(cfg.logFile()));
+                .help("Write log output to the given file. If --verbose is also given, the detailed logs will only be written to the log file.");
        parser.addArgument("--scrub-log")
                .action(Arguments.storeTrue())
-                .help("Scrub possibly sensitive information from the log, like phone numbers and UUIDs.")
-                .setDefault(cfg.scrubLog() == null ? false : cfg.scrubLog());
-        parser.addArgument("-d", "--data-dir", "-c", "--config")
-                .help("Set the path where to store data (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).")
-                .setDefault(cfg.dataDir());
+                .help("Scrub possibly sensitive information from the log, like phone numbers and UUIDs.");
+        parser.addArgument("-c", "--config")
+                .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).");

        parser.addArgument("-a", "--account", "-u", "--username")
                .help("Specify your phone number, that will be your identifier.");

        var mut = parser.addMutuallyExclusiveGroup();
-        mut.addArgument("--dbus")
-                .dest("global-dbus")
-                .help("Make request via user dbus.")
-                .action(Arguments.storeTrue())
-                .setDefault(cfg.dbus() == null ? false : cfg.dbus());
+        mut.addArgument("--dbus").dest("global-dbus").help("Make request via user dbus.").action(Arguments.storeTrue());
        mut.addArgument("--dbus-system")
                .dest("global-dbus-system")
                .help("Make request via system dbus.")
-                .action(Arguments.storeTrue())
-                .setDefault(cfg.dbusSystem() == null ? false : cfg.dbusSystem());
+                .action(Arguments.storeTrue());
        parser.addArgument("--bus-name")
                .dest("global-bus-name")
-                .setDefault(cfg.busName() != null ? cfg.busName() : DbusConfig.getBusname())
+                .setDefault(DbusConfig.getBusname())
                .help("Specify the D-Bus bus name to connect to.");

        parser.addArgument("-o", "--output")
                .help("Choose to output in plain text or JSON")
-                .type(Arguments.enumStringType(OutputType.class))
-                .setDefault(cfg.output() == null ? null : cfg.output());
+                .type(Arguments.enumStringType(OutputType.class));

        parser.addArgument("--service-environment")
                .help("Choose the server environment to use.")
                .type(Arguments.enumStringType(ServiceEnvironmentCli.class))
-                .setDefault(cfg.serviceEnvironment() != null ? cfg.serviceEnvironment() : ServiceEnvironmentCli.LIVE);
+                .setDefault(ServiceEnvironmentCli.LIVE);

        parser.addArgument("--trust-new-identities")
                .help("Choose when to trust new identities.")
                .type(Arguments.enumStringType(TrustNewIdentityCli.class))
-                .setDefault(cfg.trustNewIdentities() != null
-                        ? cfg.trustNewIdentities()
-                        : TrustNewIdentityCli.ON_FIRST_USE);
+                .setDefault(TrustNewIdentityCli.ON_FIRST_USE);

        parser.addArgument("--disable-send-log")
                .help("Disable message send log (for resending messages that recipient couldn't decrypt)")
-                .action(Arguments.storeTrue())
-                .setDefault(cfg.disableSendLog() != null ? cfg.disableSendLog() : false);
+                .action(Arguments.storeTrue());

        parser.epilog(
                "The global arguments are shown with 'signal-cli -h' and need to come before the subcommand, while the subcommand-specific arguments (shown with 'signal-cli SUBCOMMAND -h') need to be given after the subcommand.");
@ -184,20 +169,16 @@ public class App {
            }

            account = getAccountIfOnlyOne(signalAccountFiles);
+        } else if (!Manager.isValidNumber(account, null)) {
+            throw new UserErrorException("Invalid account (phone number), make sure you include the country code.");
        }

        if (command instanceof RegistrationCommand registrationCommand) {
-            if (!Manager.isValidNumber(account, null)) {
-                throw new UserErrorException("Invalid account (phone number), make sure you include the country code.");
-            }
            handleRegistrationCommand(registrationCommand, account, signalAccountFiles, commandHandler);
            return;
        }

        if (command instanceof LocalCommand localCommand) {
-            if (!Manager.isValidNumber(account, null) && !Manager.isValidAci(account)) {
-                throw new UserErrorException("Invalid account (phone number), make sure you include the country code.");
-            }
            handleLocalCommand(localCommand, account, signalAccountFiles, commandHandler);
            return;
        }
@ -238,12 +219,12 @@ public class App {
    }

    private SignalAccountFiles loadSignalAccountFiles() throws IOErrorException {
-        final File dataPath;
-        final var dataDir = ns.getString("data-dir");
-        if (dataDir != null) {
-            dataPath = new File(dataDir);
+        final File configPath;
+        final var config = ns.getString("config");
+        if (config != null) {
+            configPath = new File(config);
        } else {
-            dataPath = getDefaultDataPath();
+            configPath = getDefaultConfigPath();
        }

        final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service-environment");
@ -259,7 +240,7 @@ public class App {
        final var disableSendLog = Boolean.TRUE.equals(ns.getBoolean("disable-send-log"));

        try {
-            return new SignalAccountFiles(dataPath,
+            return new SignalAccountFiles(configPath,
                    serviceEnvironment,
                    BaseConfig.USER_AGENT,
                    new Settings(trustNewIdentity, disableSendLog));
@ -334,11 +315,7 @@ public class App {
    ) throws CommandException {
        logger.trace("Loading account file for {}", account);
        try {
-            if (Manager.isValidAci(account)) {
-                return signalAccountFiles.initManagerByAci(account);
-            } else {
-                return signalAccountFiles.initManagerByNumber(account);
-            }
+            return signalAccountFiles.initManager(account);
        } catch (NotRegisteredException e) {
            throw new UserErrorException("User " + account + " is not registered.");
        } catch (AccountCheckException ace) {
@ -362,7 +339,7 @@ public class App {
    /**
     * @return the default data directory to be used by signal-cli.
     */
-    private static File getDefaultDataPath() {
+    private static File getDefaultConfigPath() {
        return new File(IOUtils.getDataHomeDir(), "signal-cli");
    }
 }
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@ -8,7 +8,7 @@ public class BaseConfig {
    public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();

    static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/8.21.1");
+            .orElse("Signal-Android/8.8.0");
    static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
            ? "signal-cli"
            : PROJECT_NAME + "/" + PROJECT_VERSION;
--- a/src/main/java/org/asamk/signal/ConfigLoader.java
+++ b/src/main/java/org/asamk/signal/ConfigLoader.java
@ -1,81 +0,0 @@
-package org.asamk.signal;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import org.asamk.signal.commands.exceptions.UserErrorException;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-/**
- * Loads and merges configuration files. Merge order (later files override earlier):
- * - /etc/signal-cli/config.json
- * - file pointed to by SIGNAL_CLI_CONFIG (if set)
- * - $XDG_CONFIG_HOME/signal-cli/config.json or $HOME/.config/signal-cli/config.json
- */
-public final class ConfigLoader {
-
-    private ConfigLoader() {
-    }
-
-    public static GlobalConfig load() throws UserErrorException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final ObjectNode merged = mapper.createObjectNode();
-
-        // System config
-        addIfExists(merged, mapper, Paths.get("/etc/signal-cli/config.json"));
-
-        // User config via env (if set) else XDG or ~/.config
-        final String env = System.getenv("SIGNAL_CLI_CONFIG");
-        if (env != null && !env.isEmpty()) {
-            addIfExists(merged, mapper, Paths.get(env));
-        } else {
-            final String xdg = System.getenv("XDG_CONFIG_HOME");
-            if (xdg != null && !xdg.isEmpty()) {
-                addIfExists(merged, mapper, Paths.get(xdg, "signal-cli", "config.json"));
-            } else {
-                addIfExists(merged,
-                        mapper,
-                        Paths.get(System.getProperty("user.home"), ".config", "signal-cli", "config.json"));
-            }
-        }
-
-        try {
-            if (merged.isEmpty()) {
-                return GlobalConfig.DEFAULT;
-            }
-            return mapper.treeToValue(merged, GlobalConfig.class);
-        } catch (Exception e) {
-            throw new UserErrorException("Failed to parse configuration file(s): " + e.getMessage(), e);
-        }
-    }
-
-    private static void addIfExists(ObjectNode merged, ObjectMapper mapper, Path p) throws UserErrorException {
-        if (p == null) return;
-        try {
-            if (Files.exists(p)) {
-                final JsonNode node = mapper.readTree(p.toFile());
-                merge(merged, node);
-            }
-        } catch (IOException e) {
-            throw new UserErrorException("Failed to load config from " + p + ": " + e.getMessage(), e);
-        }
-    }
-
-    private static void merge(ObjectNode target, JsonNode source) {
-        source.properties().forEach(entry -> {
-            final String name = entry.getKey();
-            final JsonNode value = entry.getValue();
-            final JsonNode existing = target.get(name);
-            if (existing != null && existing.isObject() && value.isObject()) {
-                merge((ObjectNode) existing, value);
-            } else {
-                target.set(name, value);
-            }
-        });
-    }
-}
--- a/src/main/java/org/asamk/signal/GlobalConfig.java
+++ b/src/main/java/org/asamk/signal/GlobalConfig.java
@ -1,36 +0,0 @@
-package org.asamk.signal;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public record GlobalConfig(
-        @JsonProperty("verbose") Integer verbose,
-        @JsonProperty("logFile") String logFile,
-        @JsonProperty("scrubLog") Boolean scrubLog,
-        @JsonProperty("dataDir") String dataDir,
-        @JsonProperty("busName") String busName,
-        @JsonProperty("dbus") Boolean dbus,
-        @JsonProperty("dbusSystem") Boolean dbusSystem,
-        @JsonProperty("output") OutputType output,
-        @JsonProperty("serviceEnvironment") ServiceEnvironmentCli serviceEnvironment,
-        @JsonProperty("trustNewIdentities") TrustNewIdentityCli trustNewIdentities,
-        @JsonProperty("disableSendLog") Boolean disableSendLog,
-        @JsonProperty("account") String account
-) {
-
-    public static final GlobalConfig DEFAULT = new GlobalConfig(null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            ServiceEnvironmentCli.LIVE,
-            TrustNewIdentityCli.ON_FIRST_USE,
-            null,
-            null);
-
-    public static GlobalConfig empty() {
-        return new GlobalConfig(null, null, null, null, null, null, null, null, null, null, null, null);
-    }
-}
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@ -40,32 +40,27 @@ import java.security.Security;

 public class Main {

-    static void main(String[] args) {
+    public static void main(String[] args) {
        // enable unlimited strength crypto via Policy, supported on relevant JREs
        Security.setProperty("crypto.policy", "unlimited");
        installSecurityProviderWorkaround();

-        // Load global config early so we can use its values as parser defaults
-        final GlobalConfig globalConfig;
-        try {
-            globalConfig = ConfigLoader.load();
-        } catch (UserErrorException e) {
-            System.exit(handleCommandException(e, null));
-            return;
-        }
-
        // Configuring the logger needs to happen before any logger is initialized
-        final var loggingConfig = parseLoggingConfig(args, globalConfig);
+        final var loggingConfig = parseLoggingConfig(args);
        configureLogging(loggingConfig);

-        final var parser = App.buildArgumentParser(globalConfig);
+        final var parser = App.buildArgumentParser();
        final var ns = parser.parseArgsOrFail(args);

        int status = 0;
        try {
            new App(ns).init();
        } catch (CommandException e) {
-            status = handleCommandException(e, loggingConfig);
+            System.err.println(e.getMessage());
+            if (loggingConfig.verboseLevel > 0 && e.getCause() != null) {
+                e.getCause().printStackTrace(System.err);
+            }
+            status = getStatusForError(e);
        } catch (Throwable e) {
            e.printStackTrace(System.err);
            status = 2;
@ -74,27 +69,16 @@ public class Main {
        System.exit(status);
    }

-    private static int handleCommandException(final CommandException e, final LoggingConfig loggingConfig) {
-        System.err.println(e.getMessage());
-        if (loggingConfig != null && loggingConfig.verboseLevel > 0 && e.getCause() != null) {
-            e.getCause().printStackTrace(System.err);
-        }
-        return getStatusForError(e);
-    }
-
    private static void installSecurityProviderWorkaround() {
        // Register our own security provider
        Security.insertProviderAt(new SecurityProvider(), 1);
        Security.addProvider(new BouncyCastleProvider());
    }

-    private static LoggingConfig parseLoggingConfig(final String[] args, final GlobalConfig config) {
-        final var nsLog = parseArgs(args, config);
+    private static LoggingConfig parseLoggingConfig(final String[] args) {
+        final var nsLog = parseArgs(args);
        if (nsLog == null) {
-            final var verbose = config != null && config.verbose() != null ? config.verbose() : 0;
-            final var logFile = config != null && config.logFile() != null ? new File(config.logFile()) : null;
-            final var scrubLog = config != null && Boolean.TRUE.equals(config.scrubLog());
-            return new LoggingConfig(verbose, logFile, scrubLog);
+            return new LoggingConfig(0, null, false);
        }

        final var verboseLevel = nsLog.getInt("verbose");
@ -106,20 +90,14 @@ public class Main {
    /**
     * This method only parses commandline args relevant for logging configuration.
     */
-    private static Namespace parseArgs(String[] args, final GlobalConfig config) {
+    private static Namespace parseArgs(String[] args) {
        var parser = ArgumentParsers.newFor("signal-cli", DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS)
                .includeArgumentNamesAsKeysInResult(true)
                .build()
                .defaultHelp(false);
-        parser.addArgument("-v", "--verbose")
-                .action(Arguments.count())
-                .setDefault(config == null || config.verbose() == null ? 0 : config.verbose());
-        parser.addArgument("--log-file")
-                .type(File.class)
-                .setDefault(config == null || config.logFile() == null ? null : new File(config.logFile()));
-        parser.addArgument("--scrub-log")
-                .action(Arguments.storeTrue())
-                .setDefault(config == null || config.scrubLog() == null ? false : config.scrubLog());
+        parser.addArgument("-v", "--verbose").action(Arguments.count());
+        parser.addArgument("--log-file").type(File.class);
+        parser.addArgument("--scrub-log").action(Arguments.storeTrue());

        try {
            return parser.parseKnownArgs(args, null);
@ -146,12 +124,12 @@ public class Main {

    private static int getStatusForError(final CommandException e) {
        return switch (e) {
-            case UserErrorException _ -> 1;
-            case UnexpectedErrorException _ -> 2;
-            case IOErrorException _ -> 3;
-            case UntrustedKeyErrorException _ -> 4;
-            case RateLimitErrorException _ -> 5;
-            case CaptchaRejectedErrorException _ -> 6;
+            case UserErrorException userErrorException -> 1;
+            case UnexpectedErrorException unexpectedErrorException -> 2;
+            case IOErrorException ioErrorException -> 3;
+            case UntrustedKeyErrorException untrustedKeyErrorException -> 4;
+            case RateLimitErrorException rateLimitErrorException -> 5;
+            case CaptchaRejectedErrorException captchaRejectedErrorException -> 6;
            case null -> 2;
        };
    }
--- a/src/main/java/org/asamk/signal/OutputType.java
+++ b/src/main/java/org/asamk/signal/OutputType.java
@ -1,7 +1,5 @@
 package org.asamk.signal;

-import com.fasterxml.jackson.annotation.JsonCreator;
-
 public enum OutputType {
    PLAIN_TEXT {
        @Override
@ -14,16 +12,5 @@ public enum OutputType {
        public String toString() {
            return "json";
        }
-    };
-
-    @JsonCreator
-    public static OutputType fromString(String value) {
-        if (value == null) return null;
-        final var norm = value.trim().toLowerCase().replaceAll("[^a-z0-9]", "");
-        return switch (norm) {
-            case "plaintext" -> PLAIN_TEXT;
-            case "json" -> JSON;
-            default -> throw new IllegalArgumentException("Invalid output type: " + value);
-        };
-    }
+    },
 }
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@ -310,8 +310,6 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
        if (callMessage.hangup().isPresent()) {
            var hangupMessage = callMessage.hangup().get();
            writer.println("Hangup message: {}", callIdUnsigned(hangupMessage.id()));
-            writer.println("- type: {}", hangupMessage.type());
-            writer.println("- device id: {}", hangupMessage.deviceId());
        }
        if (!callMessage.iceUpdate().isEmpty()) {
            writer.println("Ice update messages:");
--- a/src/main/java/org/asamk/signal/ServiceEnvironmentCli.java
+++ b/src/main/java/org/asamk/signal/ServiceEnvironmentCli.java
@ -1,7 +1,5 @@
 package org.asamk.signal;

-import com.fasterxml.jackson.annotation.JsonCreator;
-
 public enum ServiceEnvironmentCli {
    LIVE {
        @Override
@ -14,16 +12,5 @@ public enum ServiceEnvironmentCli {
        public String toString() {
            return "staging";
        }
-    };
-
-    @JsonCreator
-    public static ServiceEnvironmentCli fromString(String value) {
-        if (value == null) return null;
-        final var norm = value.trim().toLowerCase();
-        return switch (norm) {
-            case "live" -> LIVE;
-            case "staging" -> STAGING;
-            default -> throw new IllegalArgumentException("Invalid service-environment: " + value);
-        };
-    }
+    },
 }
--- a/src/main/java/org/asamk/signal/TrustNewIdentityCli.java
+++ b/src/main/java/org/asamk/signal/TrustNewIdentityCli.java
@ -1,7 +1,5 @@
 package org.asamk.signal;

-import com.fasterxml.jackson.annotation.JsonCreator;
-
 public enum TrustNewIdentityCli {
    ALWAYS {
        @Override
@ -20,17 +18,5 @@ public enum TrustNewIdentityCli {
        public String toString() {
            return "never";
        }
-    };
-
-    @JsonCreator
-    public static TrustNewIdentityCli fromString(String value) {
-        if (value == null) return null;
-        final var norm = value.trim().toLowerCase().replaceAll("[^a-z0-9]", "");
-        return switch (norm) {
-            case "always" -> ALWAYS;
-            case "onfirstuse" -> ON_FIRST_USE;
-            case "never" -> NEVER;
-            default -> throw new IllegalArgumentException("Invalid trust-new-identities: " + value);
-        };
-    }
+    },
 }
--- a/src/main/java/org/asamk/signal/commands/Commands.java
+++ b/src/main/java/org/asamk/signal/commands/Commands.java
@ -52,7 +52,6 @@ public class Commands {
        addCommand(new SendPollTerminateCommand());
        addCommand(new SendReactionCommand());
        addCommand(new SendReceiptCommand());
-        addCommand(new SendStoryCommand());
        addCommand(new SendSyncRequestCommand());
        addCommand(new SendTypingCommand());
        addCommand(new SendUnpinMessageCommand());
@ -61,7 +60,6 @@ public class Commands {
        addCommand(new SubmitRateLimitChallengeCommand());
        addCommand(new StartChangeNumberCommand());
        addCommand(new StartLinkCommand());
-        addCommand(new TerminateGroupCommand());
        addCommand(new TrustCommand());
        addCommand(new UnblockCommand());
        addCommand(new UnregisterCommand());
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@ -79,13 +79,12 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
            final var groupInviteLink = group.groupInviteLinkUrl();

            writer.println(
-                    "Id: {} Name: {} Description: {} Active: {} Blocked: {} Terminated: {} Members: {} Pending members: {} Requesting members: {} Banned: {} Message expiration: {} Link: {}",
+                    "Id: {} Name: {} Description: {} Active: {} Blocked: {} Members: {} Pending members: {} Requesting members: {} Banned: {} Message expiration: {} Link: {}",
                    group.groupId().toBase64(),
                    group.title(),
                    group.description(),
                    group.isMember(),
                    group.isBlocked(),
-                    group.isTerminated(),
                    resolveMembers(group.members()),
                    resolveMemberAddress(group.pendingMembers()),
                    resolveMemberAddress(group.requestingMembers()),
@ -93,12 +92,11 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
                    group.messageExpirationTimer() == 0 ? "disabled" : group.messageExpirationTimer() + "s",
                    groupInviteLink == null ? '-' : groupInviteLink.getUrl());
        } else {
-            writer.println("Id: {} Name: {}  Active: {} Blocked: {} Terminated: {}",
+            writer.println("Id: {} Name: {}  Active: {} Blocked: {}",
                    group.groupId().toBase64(),
                    group.title(),
                    group.isMember(),
-                    group.isBlocked(),
-                    group.isTerminated());
+                    group.isBlocked());
        }
    }

@ -135,8 +133,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
                            group.permissionAddMember().name(),
                            group.permissionEditDetails().name(),
                            group.permissionSendMessage().name(),
-                            groupInviteLink == null ? null : groupInviteLink.getUrl(),
-                            group.isTerminated());
+                            groupInviteLink == null ? null : groupInviteLink.getUrl());
                }).toList();
                jsonWriter.write(jsonGroups);
            }
@ -164,8 +161,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
            String permissionAddMember,
            String permissionEditDetails,
            String permissionSendMessage,
-            String groupInviteLink,
-            boolean isTerminated
+            String groupInviteLink
    ) {}

    private record JsonGroupMemberAddress(String number, String uuid) {}
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@ -144,7 +144,8 @@ public class SendCommand implements JsonRpcLocalCommand {
            }

            try {
-                m.sendEndSessionMessage(singleRecipients);
+                final var results = m.sendEndSessionMessage(singleRecipients);
+                outputResult(outputWriter, results);
                return;
            } catch (IOException e) {
                throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
--- a/Show More
+++ b/Show More
 @ -1 +1 @@
 .99.1
 .92.1