remove kikimr/driver DEPENDS

72 files changed, 0 insertions, 4851 deletions

diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_DynamicClient.cpp b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_DynamicClient.cpp
deleted file mode 100644
index 3cb1d40b0ee..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_DynamicClient.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "ru_yandex_passport_tvmauth_DynamicClient.h"
-
-#include "util.h"
-
-#include <library/cpp/tvmauth/client/facade.h>
-#include <library/cpp/tvmauth/client/misc/utils.h>
-#include <library/cpp/tvmauth/client/misc/api/dynamic_dst/tvm_client.h>
-#include <library/cpp/tvmauth/src/utils.h>
-
-using namespace NTvmAuth;
-using namespace NTvmAuthJava;
-
-jobject Java_ru_yandex_passport_tvmauth_DynamicClient_factoryDynamicClientNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong settings,
-    jlong logger) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jobject {
-        Y_ENSURE(settings);
-        NTvmApi::TClientSettings& s = *reinterpret_cast<NTvmApi::TClientSettings*>(settings);
-        s.LibVersionPrefix = "javadyn_";
-
-        auto c = NDynamicClient::TTvmClient::Create(
-            s,
-            reinterpret_cast<TJavaLogger*>(logger));
-
-        THolder<TTvmClient> instance = MakeHolder<TTvmClient>(TAsyncUpdaterPtr(c));
-
-        jclass cls = jenv->FindClass("ru/yandex/passport/tvmauth/DynamicClient$NativeHandles");
-        jobject res = jenv->AllocObject(cls);
-
-        jenv->SetLongField(
-            res,
-            jenv->GetFieldID(cls, "dyn", "J"),
-            (jlong)c.Get());
-        jenv->SetLongField(
-            res,
-            jenv->GetFieldID(cls, "common", "J"),
-            (jlong)instance.Get());
-
-        Y_UNUSED(instance.Release());
-        return res;
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_DynamicClient_addDstsNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring dsts) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        Y_ENSURE(dsts);
-        auto* instance = reinterpret_cast<NDynamicClient::TTvmClient*>(jobj);
-
-        NTvmApi::TClientSettings::TDstVector vec = NUtils::ParseDstVector(TJavaString(jenv, dsts));
-        instance->Add(NDynamicClient::TDsts(vec.begin(), vec.end()));
-    });
-}
-
-jstring Java_ru_yandex_passport_tvmauth_DynamicClient_getOptionalServiceTicketForTvmIdNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jint tvmId) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jstring {
-        auto* instance = reinterpret_cast<NDynamicClient::TTvmClient*>(jobj);
-        std::optional<TString> res = instance->GetOptionalServiceTicketFor(tvmId);
-
-        return res ? jenv->NewStringUTF(res->c_str()) : nullptr;
-    });
-}
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_DynamicClient.h b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_DynamicClient.h
deleted file mode 100644
index 94bf387a353..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_DynamicClient.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class ru_yandex_passport_tvmauth_DynamicClient */
-
-#ifndef _Included_ru_yandex_passport_tvmauth_DynamicClient
-    #define _Included_ru_yandex_passport_tvmauth_DynamicClient
-    #ifdef __cplusplus
-extern "C" {
-    #endif
-    /*
-     * Class:     ru_yandex_passport_tvmauth_DynamicClient
-     * Method:    factoryDynamicClientNative
-     * Signature: (JJ)Lru/yandex/passport/tvmauth/DynamicClient/NativeHandles;
-     */
-    JNIEXPORT jobject JNICALL Java_ru_yandex_passport_tvmauth_DynamicClient_factoryDynamicClientNative(JNIEnv*, jclass, jlong, jlong);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_DynamicClient
-     * Method:    addDstsNative
-     * Signature: (JLjava/lang/String;)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_DynamicClient_addDstsNative(JNIEnv*, jclass, jlong, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_DynamicClient
-     * Method:    getOptionalServiceTicketForTvmIdNative
-     * Signature: (JI)Ljava/lang/String;
-     */
-    JNIEXPORT jstring JNICALL Java_ru_yandex_passport_tvmauth_DynamicClient_getOptionalServiceTicketForTvmIdNative(JNIEnv*, jclass, jlong, jint);
-
-    #ifdef __cplusplus
-}
-    #endif
-#endif
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_NativeTvmClient.cpp b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_NativeTvmClient.cpp
deleted file mode 100644
index a647535ff81..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_NativeTvmClient.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-#include "ru_yandex_passport_tvmauth_NativeTvmClient.h"
-
-#include "util.h"
-
-#include <library/cpp/tvmauth/client/facade.h>
-#include <library/cpp/tvmauth/client/misc/utils.h>
-#include <library/cpp/tvmauth/src/utils.h>
-
-using namespace NTvmAuth;
-using namespace NTvmAuthJava;
-
-void Java_ru_yandex_passport_tvmauth_NativeTvmClient_dispose(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        delete reinterpret_cast<TTvmClient*>(jobj);
-    });
-}
-
-jlong Java_ru_yandex_passport_tvmauth_NativeTvmClient_factoryTvmApi(
-    JNIEnv* jenv,
-    jclass,
-    jlong settings,
-    jlong logger) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jlong {
-        Y_ENSURE(settings);
-        Y_ENSURE(logger);
-
-        NTvmApi::TClientSettings& s = *reinterpret_cast<NTvmApi::TClientSettings*>(settings);
-        s.LibVersionPrefix = "java_";
-
-        return (jlong) new TTvmClient(
-            s,
-            reinterpret_cast<TJavaLogger*>(logger));
-    });
-}
-
-jlong Java_ru_yandex_passport_tvmauth_NativeTvmClient_factoryTvmTool(
-    JNIEnv* jenv,
-    jclass,
-    jlong settings,
-    jlong logger) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jlong {
-        Y_ENSURE(settings);
-        Y_ENSURE(logger);
-
-        return (jlong) new TTvmClient(
-            *reinterpret_cast<NTvmTool::TClientSettings*>(settings),
-            reinterpret_cast<TJavaLogger*>(logger));
-    });
-}
-
-jobject Java_ru_yandex_passport_tvmauth_NativeTvmClient_getStatusNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jobject {
-        TTvmClient* instance = reinterpret_cast<TTvmClient*>(jobj);
-        const TClientStatus status = instance->GetStatus();
-
-        jclass cls = jenv->FindClass("ru/yandex/passport/tvmauth/ClientStatus");
-        jobject res = jenv->AllocObject(cls);
-
-        SetClientStatus(jenv, status.GetCode(), cls, res);
-
-        jenv->SetObjectField(
-            res,
-            jenv->GetFieldID(cls, "lastError", "Ljava/lang/String;"),
-            jenv->NewStringUTF(status.GetLastError().c_str()));
-
-        return res;
-    });
-}
-
-jstring Java_ru_yandex_passport_tvmauth_NativeTvmClient_getServiceTicketForAlias(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring alias) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jstring {
-        Y_ENSURE(alias);
-        TTvmClient* instance = reinterpret_cast<TTvmClient*>(jobj);
-        return jenv->NewStringUTF(instance->GetServiceTicketFor(TString(TJavaString(jenv, alias))).c_str());
-    });
-}
-
-jstring Java_ru_yandex_passport_tvmauth_NativeTvmClient_getServiceTicketForTvmId(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jint tvmId) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jstring {
-        TTvmClient* instance = reinterpret_cast<TTvmClient*>(jobj);
-        return jenv->NewStringUTF(instance->GetServiceTicketFor(tvmId).c_str());
-    });
-}
-
-jobject Java_ru_yandex_passport_tvmauth_NativeTvmClient_checkServiceTicketNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring ticket) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jobject {
-        Y_ENSURE(ticket);
-        TTvmClient* instance = reinterpret_cast<TTvmClient*>(jobj);
-        TCheckedServiceTicket t = instance->CheckServiceTicket(TJavaString(jenv, ticket));
-        return BuildJavaObject(jenv, t);
-    });
-}
-
-jobject Java_ru_yandex_passport_tvmauth_NativeTvmClient_checkUserTicketNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring ticket) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jobject {
-        Y_ENSURE(ticket);
-        TTvmClient* instance = reinterpret_cast<TTvmClient*>(jobj);
-        TCheckedUserTicket t = instance->CheckUserTicket(TJavaString(jenv, ticket));
-        return BuildJavaObject(jenv, t);
-    });
-}
-
-jobject Java_ru_yandex_passport_tvmauth_NativeTvmClient_checkUserTicketNativeWithOverridedEnv(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring ticket,
-    jint env) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jobject {
-        Y_ENSURE(ticket);
-        TTvmClient* instance = reinterpret_cast<TTvmClient*>(jobj);
-        TCheckedUserTicket t = instance->CheckUserTicket(TJavaString(jenv, ticket), (EBlackboxEnv)env);
-        return BuildJavaObject(jenv, t);
-    });
-}
-
-jstring Java_ru_yandex_passport_tvmauth_NativeTvmClient_getRolesNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring revision) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jstring {
-        TTvmClient* instance = reinterpret_cast<TTvmClient*>(jobj);
-
-        NRoles::TRolesPtr roles = instance->GetRoles();
-        if (revision && TJavaString(jenv, revision) == roles->GetMeta().Revision) {
-            return nullptr;
-        }
-
-        return jenv->NewStringUTF(roles->GetRaw().c_str());
-    });
-}
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_NativeTvmClient.h b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_NativeTvmClient.h
deleted file mode 100644
index 20946dc8300..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_NativeTvmClient.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#pragma once
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class ru_yandex_passport_tvmauth_NativeTvmClient */
-
-#ifndef _Included_ru_yandex_passport_tvmauth_NativeTvmClient
-    #define _Included_ru_yandex_passport_tvmauth_NativeTvmClient
-    #ifdef __cplusplus
-extern "C" {
-    #endif
-    /*
-     * Class:     ru_yandex_passport_tvmauth_NativeTvmClient
-     * Method:    factoryTvmApi
-     * Signature: (JJ)J
-     */
-    JNIEXPORT jlong JNICALL Java_ru_yandex_passport_tvmauth_NativeTvmClient_factoryTvmApi(JNIEnv*, jclass, jlong, jlong);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_NativeTvmClient
-     * Method:    factoryTvmTool
-     * Signature: (JJ)J
-     */
-    JNIEXPORT jlong JNICALL Java_ru_yandex_passport_tvmauth_NativeTvmClient_factoryTvmTool(JNIEnv*, jclass, jlong, jlong);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_NativeTvmClient
-     * Method:    dispose
-     * Signature: (J)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_NativeTvmClient_dispose(JNIEnv*, jclass, jlong);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_NativeTvmClient
-     * Method:    getStatusNative
-     * Signature: (J)Lru/yandex/passport/tvmauth/ClientStatus;
-     */
-    JNIEXPORT jobject JNICALL Java_ru_yandex_passport_tvmauth_NativeTvmClient_getStatusNative(JNIEnv*, jclass, jlong);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_NativeTvmClient
-     * Method:    getServiceTicketForAlias
-     * Signature: (JLjava/lang/String;)Ljava/lang/String;
-     */
-    JNIEXPORT jstring JNICALL Java_ru_yandex_passport_tvmauth_NativeTvmClient_getServiceTicketForAlias(JNIEnv*, jclass, jlong, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_NativeTvmClient
-     * Method:    getServiceTicketForTvmId
-     * Signature: (JI)Ljava/lang/String;
-     */
-    JNIEXPORT jstring JNICALL Java_ru_yandex_passport_tvmauth_NativeTvmClient_getServiceTicketForTvmId(JNIEnv*, jclass, jlong, jint);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_NativeTvmClient
-     * Method:    checkServiceTicketNative
-     * Signature: (JLjava/lang/String;)Lru/yandex/passport/tvmauth/CheckedServiceTicket;
-     */
-    JNIEXPORT jobject JNICALL Java_ru_yandex_passport_tvmauth_NativeTvmClient_checkServiceTicketNative(JNIEnv*, jclass, jlong, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_NativeTvmClient
-     * Method:    checkUserTicketNative
-     * Signature: (JLjava/lang/String;)Lru/yandex/passport/tvmauth/CheckedUserTicket;
-     */
-    JNIEXPORT jobject JNICALL Java_ru_yandex_passport_tvmauth_NativeTvmClient_checkUserTicketNative(JNIEnv*, jclass, jlong, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_NativeTvmClient
-     * Method:    checkUserTicketNativeWithOverridedEnv
-     * Signature: (JLjava/lang/String;I)Lru/yandex/passport/tvmauth/CheckedUserTicket;
-     */
-    JNIEXPORT jobject JNICALL Java_ru_yandex_passport_tvmauth_NativeTvmClient_checkUserTicketNativeWithOverridedEnv(JNIEnv*, jclass, jlong, jstring, jint);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_NativeTvmClient
-     * Method:    getRolesNative
-     * Signature: (JLjava/lang/String;)Ljava/lang/String;
-     */
-    JNIEXPORT jstring JNICALL Java_ru_yandex_passport_tvmauth_NativeTvmClient_getRolesNative(JNIEnv*, jclass, jlong, jstring);
-
-    #ifdef __cplusplus
-}
-    #endif
-#endif
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_TvmApiSettings.cpp b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_TvmApiSettings.cpp
deleted file mode 100644
index dc9a5042c3d..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_TvmApiSettings.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-#include "ru_yandex_passport_tvmauth_TvmApiSettings.h"
-
-#include "util.h"
-
-#include <library/cpp/tvmauth/client/misc/utils.h>
-#include <library/cpp/tvmauth/client/misc/api/settings.h>
-
-using namespace NTvmAuth;
-using namespace NTvmAuthJava;
-
-void Java_ru_yandex_passport_tvmauth_TvmApiSettings_dispose(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        delete reinterpret_cast<NTvmApi::TClientSettings*>(jobj);
-    });
-}
-
-jlong Java_ru_yandex_passport_tvmauth_TvmApiSettings_factory(
-    JNIEnv* jenv,
-    jclass) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jlong {
-        return (jlong) new NTvmApi::TClientSettings;
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmApiSettings_setSelfTvmIdNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jint tvmId) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        NTvmApi::TClientSettings* instance = reinterpret_cast<NTvmApi::TClientSettings*>(jobj);
-        instance->SelfTvmId = tvmId;
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmApiSettings_enableServiceTicketCheckingNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        NTvmApi::TClientSettings* instance = reinterpret_cast<NTvmApi::TClientSettings*>(jobj);
-        instance->CheckServiceTickets = true;
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmApiSettings_enableUserTicketCheckingNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jint env) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        NTvmApi::TClientSettings* instance = reinterpret_cast<NTvmApi::TClientSettings*>(jobj);
-        instance->CheckUserTicketsWithBbEnv = static_cast<EBlackboxEnv>(env);
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmApiSettings_setDiskCacheDirNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring dir) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        Y_ENSURE(dir);
-        NTvmApi::TClientSettings* instance = reinterpret_cast<NTvmApi::TClientSettings*>(jobj);
-        instance->DiskCacheDir = TString(TJavaString(jenv, dir));
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmApiSettings_enableServiceTicketsFetchOptionsWithAliases(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring selfSecret,
-    jstring dsts) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> void {
-        Y_ENSURE(selfSecret);
-        Y_ENSURE(dsts);
-        NTvmApi::TClientSettings* instance = reinterpret_cast<NTvmApi::TClientSettings*>(jobj);
-        instance->Secret = TString(TJavaString(jenv, selfSecret));
-        instance->FetchServiceTicketsForDstsWithAliases = NUtils::ParseDstMap(TJavaString(jenv, dsts));
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmApiSettings_enableServiceTicketsFetchOptionsWithTvmIds(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring selfSecret,
-    jstring dsts) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> void {
-        Y_ENSURE(selfSecret);
-        Y_ENSURE(dsts);
-        NTvmApi::TClientSettings* instance = reinterpret_cast<NTvmApi::TClientSettings*>(jobj);
-        instance->Secret = TString(TJavaString(jenv, selfSecret));
-        instance->FetchServiceTicketsForDsts = NUtils::ParseDstVector(TJavaString(jenv, dsts));
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmApiSettings_fetchRolesForIdmSystemSlugNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring slug) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        NTvmApi::TClientSettings* instance = reinterpret_cast<NTvmApi::TClientSettings*>(jobj);
-        instance->FetchRolesForIdmSystemSlug = TString(TJavaString(jenv, slug));
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmApiSettings_shouldCheckSrcNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jboolean value) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        NTvmApi::TClientSettings* instance = reinterpret_cast<NTvmApi::TClientSettings*>(jobj);
-        instance->ShouldCheckSrc = value;
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmApiSettings_shouldCheckDefaultUidNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jboolean value) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        NTvmApi::TClientSettings* instance = reinterpret_cast<NTvmApi::TClientSettings*>(jobj);
-        instance->ShouldCheckDefaultUid = value;
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmApiSettings_setTvmHostPortNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring host,
-    jint port) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> void {
-        NTvmApi::TClientSettings* instance = reinterpret_cast<NTvmApi::TClientSettings*>(jobj);
-        instance->TvmHost = TString(TJavaString(jenv, host));
-        instance->TvmPort = port;
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmApiSettings_setTiroleConnectionParamsNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring host,
-    jint port,
-    jint tvmid) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        NTvmApi::TClientSettings* instance = reinterpret_cast<NTvmApi::TClientSettings*>(jobj);
-        instance->TiroleHost = TString(TJavaString(jenv, host));
-        instance->TirolePort = port;
-        instance->TiroleTvmId = tvmid;
-    });
-}
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_TvmApiSettings.h b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_TvmApiSettings.h
deleted file mode 100644
index 7f9dbab02eb..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_TvmApiSettings.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#pragma once
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class ru_yandex_passport_tvmauth_TvmApiSettings */
-
-#ifndef _Included_ru_yandex_passport_tvmauth_TvmApiSettings
-    #define _Included_ru_yandex_passport_tvmauth_TvmApiSettings
-    #ifdef __cplusplus
-extern "C" {
-    #endif
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmApiSettings
-     * Method:    factory
-     * Signature: ()J
-     */
-    JNIEXPORT jlong JNICALL Java_ru_yandex_passport_tvmauth_TvmApiSettings_factory(JNIEnv*, jclass);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmApiSettings
-     * Method:    dispose
-     * Signature: (J)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmApiSettings_dispose(JNIEnv*, jclass, jlong);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmApiSettings
-     * Method:    setSelfTvmIdNative
-     * Signature: (JI)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmApiSettings_setSelfTvmIdNative(JNIEnv*, jclass, jlong, jint);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmApiSettings
-     * Method:    enableServiceTicketCheckingNative
-     * Signature: (J)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmApiSettings_enableServiceTicketCheckingNative(JNIEnv*, jclass, jlong);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmApiSettings
-     * Method:    enableUserTicketCheckingNative
-     * Signature: (JI)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmApiSettings_enableUserTicketCheckingNative(JNIEnv*, jclass, jlong, jint);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmApiSettings
-     * Method:    setDiskCacheDirNative
-     * Signature: (JLjava/lang/String;)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmApiSettings_setDiskCacheDirNative(JNIEnv*, jclass, jlong, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmApiSettings
-     * Method:    enableServiceTicketsFetchOptionsWithAliases
-     * Signature: (JLjava/lang/String;Ljava/lang/String;)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmApiSettings_enableServiceTicketsFetchOptionsWithAliases(JNIEnv*, jclass, jlong, jstring, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmApiSettings
-     * Method:    enableServiceTicketsFetchOptionsWithTvmIds
-     * Signature: (JLjava/lang/String;Ljava/lang/String;)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmApiSettings_enableServiceTicketsFetchOptionsWithTvmIds(JNIEnv*, jclass, jlong, jstring, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmApiSettings
-     * Method:    fetchRolesForIdmSystemSlugNative
-     * Signature: (JLjava/lang/String;)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmApiSettings_fetchRolesForIdmSystemSlugNative(JNIEnv*, jclass, jlong, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmApiSettings
-     * Method:    shouldCheckSrcNative
-     * Signature: (JZ)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmApiSettings_shouldCheckSrcNative(JNIEnv*, jclass, jlong, jboolean);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmApiSettings
-     * Method:    shouldCheckDefaultUidNative
-     * Signature: (JZ)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmApiSettings_shouldCheckDefaultUidNative(JNIEnv*, jclass, jlong, jboolean);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmApiSettings
-     * Method:    setTvmHostPortNative
-     * Signature: (JLjava/lang/String;I)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmApiSettings_setTvmHostPortNative(JNIEnv*, jclass, jlong, jstring, jint);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmApiSettings
-     * Method:    setTiroleConnectionParamsNative
-     * Signature: (JLjava/lang/String;II)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmApiSettings_setTiroleConnectionParamsNative(JNIEnv*, jclass, jlong, jstring, jint, jint);
-
-    #ifdef __cplusplus
-}
-    #endif
-#endif
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_TvmToolSettings.cpp b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_TvmToolSettings.cpp
deleted file mode 100644
index 2f63b4a294c..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_TvmToolSettings.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "ru_yandex_passport_tvmauth_TvmToolSettings.h"
-
-#include "util.h"
-
-#include <library/cpp/tvmauth/client/misc/tool/settings.h>
-
-using namespace NTvmAuth;
-using namespace NTvmAuthJava;
-
-void Java_ru_yandex_passport_tvmauth_TvmToolSettings_dispose(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        delete reinterpret_cast<NTvmTool::TClientSettings*>(jobj);
-    });
-}
-
-jlong Java_ru_yandex_passport_tvmauth_TvmToolSettings_factory(
-    JNIEnv* jenv,
-    jclass,
-    jstring selfAlias) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jlong {
-        Y_ENSURE(selfAlias);
-        return (jlong) new NTvmTool::TClientSettings(
-            TString(TJavaString(jenv, selfAlias)));
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmToolSettings_setPortNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jint port) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        NTvmTool::TClientSettings* instance = reinterpret_cast<NTvmTool::TClientSettings*>(jobj);
-        instance->SetPort(port);
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmToolSettings_setHostnameNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring hostname) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        Y_ENSURE(hostname);
-        NTvmTool::TClientSettings* instance = reinterpret_cast<NTvmTool::TClientSettings*>(jobj);
-        instance->SetHostname(TString(TJavaString(jenv, hostname)));
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmToolSettings_setAuthTokenNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring authtoken) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        Y_ENSURE(authtoken);
-        NTvmTool::TClientSettings* instance = reinterpret_cast<NTvmTool::TClientSettings*>(jobj);
-        instance->SetAuthToken(TString(TJavaString(jenv, authtoken)));
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmToolSettings_overrideBlackboxEnv(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jint env) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        NTvmTool::TClientSettings* instance = reinterpret_cast<NTvmTool::TClientSettings*>(jobj);
-        instance->OverrideBlackboxEnv(static_cast<EBlackboxEnv>(env));
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmToolSettings_shouldCheckSrcNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jboolean value) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        NTvmTool::TClientSettings* instance = reinterpret_cast<NTvmTool::TClientSettings*>(jobj);
-        instance->ShouldCheckSrc = value;
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_TvmToolSettings_shouldCheckDefaultUidNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jboolean value) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        NTvmTool::TClientSettings* instance = reinterpret_cast<NTvmTool::TClientSettings*>(jobj);
-        instance->ShouldCheckDefaultUid = value;
-    });
-}
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_TvmToolSettings.h b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_TvmToolSettings.h
deleted file mode 100644
index cbe2f78b14e..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_TvmToolSettings.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#pragma once
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class ru_yandex_passport_tvmauth_TvmToolSettings */
-
-#ifndef _Included_ru_yandex_passport_tvmauth_TvmToolSettings
-    #define _Included_ru_yandex_passport_tvmauth_TvmToolSettings
-    #ifdef __cplusplus
-extern "C" {
-    #endif
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmToolSettings
-     * Method:    factory
-     * Signature: (Ljava/lang/String;)J
-     */
-    JNIEXPORT jlong JNICALL Java_ru_yandex_passport_tvmauth_TvmToolSettings_factory(JNIEnv*, jclass, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmToolSettings
-     * Method:    dispose
-     * Signature: (J)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmToolSettings_dispose(JNIEnv*, jclass, jlong);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmToolSettings
-     * Method:    setPortNative
-     * Signature: (JI)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmToolSettings_setPortNative(JNIEnv*, jclass, jlong, jint);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmToolSettings
-     * Method:    setHostnameNative
-     * Signature: (JLjava/lang/String;)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmToolSettings_setHostnameNative(JNIEnv*, jclass, jlong, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmToolSettings
-     * Method:    setAuthTokenNative
-     * Signature: (JLjava/lang/String;)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmToolSettings_setAuthTokenNative(JNIEnv*, jclass, jlong, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmToolSettings
-     * Method:    overrideBlackboxEnv
-     * Signature: (JI)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmToolSettings_overrideBlackboxEnv(JNIEnv*, jclass, jlong, jint);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmToolSettings
-     * Method:    shouldCheckSrcNative
-     * Signature: (JZ)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmToolSettings_shouldCheckSrcNative(JNIEnv*, jclass, jlong, jboolean);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_TvmToolSettings
-     * Method:    shouldCheckDefaultUidNative
-     * Signature: (JZ)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_TvmToolSettings_shouldCheckDefaultUidNative(JNIEnv*, jclass, jlong, jboolean);
-
-    #ifdef __cplusplus
-}
-    #endif
-#endif
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Unittest.cpp b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Unittest.cpp
deleted file mode 100644
index c04e7afe54a..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Unittest.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "ru_yandex_passport_tvmauth_Unittest.h"
-
-#include "util.h"
-
-#include <library/cpp/tvmauth/src/service_impl.h>
-#include <library/cpp/tvmauth/src/user_impl.h>
-
-#include <util/generic/strbuf.h>
-#include <util/string/cast.h>
-
-using namespace NTvmAuth;
-using namespace NTvmAuthJava;
-
-jobject Java_ru_yandex_passport_tvmauth_Unittest_createServiceTicketNative(
-    JNIEnv* jenv,
-    jclass,
-    jint status,
-    jint src,
-    jlong issuerUid) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jobject {
-        return BuildJavaObject(
-            jenv,
-            TCheckedServiceTicket::TImpl::CreateTicketForTests(
-                static_cast<ETicketStatus>(status),
-                src,
-                issuerUid));
-    });
-}
-
-jobject Java_ru_yandex_passport_tvmauth_Unittest_createUserTicketNative(
-    JNIEnv* jenv,
-    jclass,
-    jint status,
-    jlong defaultUid,
-    jstring scopes,
-    jstring uids,
-    jint env) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jobject {
-        Y_ENSURE(scopes);
-        Y_ENSURE(uids);
-        TJavaString scTmp(jenv, scopes);
-        TScopes sc;
-        TStringBuf scTmpBuf = scTmp;
-        while (scTmpBuf) {
-            sc.push_back(scTmpBuf.NextTok(';'));
-        }
-
-        TJavaString uiTmp(jenv, uids);
-        TUids ui;
-        TStringBuf uiTmpBuf = uiTmp;
-        while (uiTmpBuf) {
-            ui.push_back(IntFromString<TUid, 10>(uiTmpBuf.NextTok(';')));
-        }
-
-        return BuildJavaObject(
-            jenv,
-            TCheckedUserTicket::TImpl::CreateTicketForTests(
-                static_cast<ETicketStatus>(status),
-                defaultUid,
-                sc,
-                ui,
-                EBlackboxEnv(env)));
-    });
-}
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Unittest.h b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Unittest.h
deleted file mode 100644
index f96591a98e7..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Unittest.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class ru_yandex_passport_tvmauth_ServiceTicket */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-    JNIEXPORT jobject JNICALL Java_ru_yandex_passport_tvmauth_Unittest_createServiceTicketNative(JNIEnv*, jclass, jint, jint, jlong);
-
-    JNIEXPORT jobject JNICALL Java_ru_yandex_passport_tvmauth_Unittest_createUserTicketNative(JNIEnv*, jclass, jint, jlong, jstring, jstring, jint);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Utils.cpp b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Utils.cpp
deleted file mode 100644
index 20ec1a0498f..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Utils.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "ru_yandex_passport_tvmauth_Utils.h"
-
-#include "util.h"
-
-#include <library/cpp/tvmauth/utils.h>
-
-#include <util/generic/strbuf.h>
-
-using namespace NTvmAuth;
-using namespace NTvmAuthJava;
-
-jstring Java_ru_yandex_passport_tvmauth_Utils_removeTicketSignature(JNIEnv* jenv, jclass, jstring ticketBody) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jstring {
-        Y_ENSURE(ticketBody);
-        TString removedSignature(NUtils::RemoveTicketSignature(TJavaString(jenv, ticketBody)));
-        jstring result = jenv->NewStringUTF(removedSignature.c_str());
-        return result;
-    });
-}
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Utils.h b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Utils.h
deleted file mode 100644
index e982923fa8b..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Utils.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class ru_yandex_passport_tvmauth_Utils */
-
-#ifndef _Included_ru_yandex_passport_tvmauth_Utils
-    #define _Included_ru_yandex_passport_tvmauth_Utils
-    #ifdef __cplusplus
-extern "C" {
-    #endif
-    /*
-     * Class:     ru_yandex_passport_tvmauth_Utils
-     * Method:    removeTicketSignature
-     * Signature: (Ljava/lang/String;)Ljava/lang/String;
-     */
-    JNIEXPORT jstring JNICALL Java_ru_yandex_passport_tvmauth_Utils_removeTicketSignature(JNIEnv*, jclass, jstring);
-
-    #ifdef __cplusplus
-}
-    #endif
-#endif
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Version.cpp b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Version.cpp
deleted file mode 100644
index dcb4c6d313e..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Version.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "ru_yandex_passport_tvmauth_Version.h"
-
-#include <library/cpp/tvmauth/version.h>
-
-#include <util/generic/strbuf.h>
-#include <util/generic/string.h>
-
-using namespace NTvmAuth;
-
-jstring Java_ru_yandex_passport_tvmauth_Version_get(JNIEnv* jenv, jclass) {
-    return jenv->NewStringUTF((TString("java_") + LibVersion()).c_str());
-}
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Version.h b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Version.h
deleted file mode 100644
index a1ffb3c293d..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_Version.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class ru_yandex_passport_tvmauth_Version */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-    /*
-     * Class:     ru_yandex_passport_tvmauthVersion
-     * Method:    get
-     * Signature: ()Ljava/lang/String;
-     */
-    JNIEXPORT jstring JNICALL Java_ru_yandex_passport_tvmauth_Version_get(JNIEnv*, jclass);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_deprecated_ServiceContext.cpp b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_deprecated_ServiceContext.cpp
deleted file mode 100644
index 0fdac45ce1c..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_deprecated_ServiceContext.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "ru_yandex_passport_tvmauth_deprecated_ServiceContext.h"
-
-#include "util.h"
-
-#include <library/cpp/tvmauth/deprecated/service_context.h>
-#include <library/cpp/tvmauth/src/service_impl.h>
-
-#include <util/generic/strbuf.h>
-
-using namespace NTvmAuth;
-using namespace NTvmAuthJava;
-
-void Java_ru_yandex_passport_tvmauth_deprecated_ServiceContext_dispose(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        delete reinterpret_cast<TServiceContext::TImpl*>(jobj);
-    });
-}
-
-jstring Java_ru_yandex_passport_tvmauth_deprecated_ServiceContext_signCgiParamsForTvmNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring ts,
-    jstring dst,
-    jstring scopes) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jstring {
-        Y_ENSURE(ts);
-        Y_ENSURE(dst);
-        Y_ENSURE(scopes);
-        auto* instance = reinterpret_cast<TServiceContext::TImpl*>(jobj);
-        jstring result = jenv->NewStringUTF(
-            instance->SignCgiParamsForTvm(
-                        TJavaString(jenv, ts),
-                        TJavaString(jenv, dst),
-                        TJavaString(jenv, scopes))
-                .c_str());
-        return result;
-    });
-}
-
-jobject Java_ru_yandex_passport_tvmauth_deprecated_ServiceContext_checkNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring ticketBody) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jobject {
-        Y_ENSURE(ticketBody);
-        auto* instance = reinterpret_cast<TServiceContext::TImpl*>(jobj);
-
-        return BuildJavaObject(jenv, instance->Check(TJavaString(jenv, ticketBody)));
-    });
-}
-
-jlong Java_ru_yandex_passport_tvmauth_deprecated_ServiceContext_factory(
-    JNIEnv* jenv,
-    jclass,
-    jint tvmId,
-    jstring secretBase64,
-    jstring tvmKeysResponse) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jlong {
-        if (secretBase64 != nullptr && tvmKeysResponse != nullptr) {
-            return (jlong) new TServiceContext::TImpl(
-                TJavaString(jenv, secretBase64),
-                tvmId,
-                TJavaString(jenv, tvmKeysResponse));
-        }
-
-        if (tvmKeysResponse != nullptr) {
-            return (jlong) new TServiceContext::TImpl(
-                tvmId,
-                TJavaString(jenv, tvmKeysResponse));
-        }
-
-        if (secretBase64 != nullptr) {
-            return (jlong) new TServiceContext::TImpl(TJavaString(jenv, secretBase64));
-        }
-
-        ythrow yexception() << "Missing tvmKeysResponse or secretBase64";
-    });
-}
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_deprecated_ServiceContext.h b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_deprecated_ServiceContext.h
deleted file mode 100644
index 34cedd20e9a..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_deprecated_ServiceContext.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class ru_yandex_passport_tvmauth_deprecated_ServiceContext */
-
-#ifndef _Included_ru_yandex_passport_tvmauth_deprecated_ServiceContext
-    #define _Included_ru_yandex_passport_tvmauth_deprecated_ServiceContext
-    #ifdef __cplusplus
-extern "C" {
-    #endif
-    /*
-     * Class:     ru_yandex_passport_tvmauth_deprecated_ServiceContext
-     * Method:    factory
-     * Signature: (ILjava/lang/String;Ljava/lang/String;)J
-     */
-    JNIEXPORT jlong JNICALL Java_ru_yandex_passport_tvmauth_deprecated_ServiceContext_factory(JNIEnv*, jclass, jint, jstring, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_deprecated_ServiceContext
-     * Method:    dispose
-     * Signature: (J)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_deprecated_ServiceContext_dispose(JNIEnv*, jclass, jlong);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_deprecated_ServiceContext
-     * Method:    checkNative
-     * Signature: (JLjava/lang/String;)Lru/yandex/passport/tvmauth/CheckedServiceTicket;
-     */
-    JNIEXPORT jobject JNICALL Java_ru_yandex_passport_tvmauth_deprecated_ServiceContext_checkNative(JNIEnv*, jclass, jlong, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_deprecated_ServiceContext
-     * Method:    signCgiParamsForTvmNative
-     * Signature: (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-     */
-    JNIEXPORT jstring JNICALL Java_ru_yandex_passport_tvmauth_deprecated_ServiceContext_signCgiParamsForTvmNative(JNIEnv*, jclass, jlong, jstring, jstring, jstring);
-
-    #ifdef __cplusplus
-}
-    #endif
-#endif
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_deprecated_UserContext.cpp b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_deprecated_UserContext.cpp
deleted file mode 100644
index 60934e59204..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_deprecated_UserContext.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "ru_yandex_passport_tvmauth_deprecated_UserContext.h"
-
-#include "util.h"
-
-#include <library/cpp/tvmauth/deprecated/user_context.h>
-#include <library/cpp/tvmauth/src/user_impl.h>
-
-#include <util/generic/strbuf.h>
-
-using namespace NTvmAuth;
-using namespace NTvmAuthJava;
-
-void Java_ru_yandex_passport_tvmauth_deprecated_UserContext_dispose(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        delete reinterpret_cast<TUserContext::TImpl*>(jobj);
-    });
-}
-
-jobject Java_ru_yandex_passport_tvmauth_deprecated_UserContext_checkNative(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj,
-    jstring ticketBody) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jobject {
-        Y_ENSURE(ticketBody);
-        auto* instance = reinterpret_cast<TUserContext::TImpl*>(jobj);
-        return BuildJavaObject(jenv, instance->Check(TJavaString(jenv, ticketBody)));
-    });
-}
-
-jlong Java_ru_yandex_passport_tvmauth_deprecated_UserContext_factory(
-    JNIEnv* jenv,
-    jclass,
-    jint env,
-    jstring tvmKeysResponse) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jlong {
-        Y_ENSURE(tvmKeysResponse);
-        return (jlong) new TUserContext::TImpl(
-            EBlackboxEnv(env),
-            TJavaString(jenv, tvmKeysResponse));
-    });
-}
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_deprecated_UserContext.h b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_deprecated_UserContext.h
deleted file mode 100644
index 88a7b2ec104..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_deprecated_UserContext.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class ru_yandex_passport_tvmauth_deprecated_UserContext */
-
-#ifndef _Included_ru_yandex_passport_tvmauth_deprecated_UserContext
-    #define _Included_ru_yandex_passport_tvmauth_deprecated_UserContext
-    #ifdef __cplusplus
-extern "C" {
-    #endif
-    /*
-     * Class:     ru_yandex_passport_tvmauth_deprecated_UserContext
-     * Method:    factory
-     * Signature: (ILjava/lang/String;)J
-     */
-    JNIEXPORT jlong JNICALL Java_ru_yandex_passport_tvmauth_deprecated_UserContext_factory(JNIEnv*, jclass, jint, jstring);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_deprecated_UserContext
-     * Method:    dispose
-     * Signature: (J)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_deprecated_UserContext_dispose(JNIEnv*, jclass, jlong);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_deprecated_UserContext
-     * Method:    checkNative
-     * Signature: (JLjava/lang/String;)Lru/yandex/passport/tvmauth/CheckedUserTicket;
-     */
-    JNIEXPORT jobject JNICALL Java_ru_yandex_passport_tvmauth_deprecated_UserContext_checkNative(JNIEnv*, jclass, jlong, jstring);
-
-    #ifdef __cplusplus
-}
-    #endif
-#endif
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_internal_LogFetcher.cpp b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_internal_LogFetcher.cpp
deleted file mode 100644
index 41634829da0..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_internal_LogFetcher.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-#include "ru_yandex_passport_tvmauth_internal_LogFetcher.h"
-
-#include "util.h"
-
-using namespace NTvmAuth;
-using namespace NTvmAuthJava;
-
-jobjectArray Java_ru_yandex_passport_tvmauth_internal_LogFetcher_fetch(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jobjectArray {
-        TJavaLogger* instance = reinterpret_cast<TJavaLogger*>(jobj);
-        const TVector<TJavaLogger::TMessage> messages = instance->FetchMessages();
-        if (messages.empty()) {
-            return nullptr;
-        }
-
-        jclass cls = jenv->FindClass("ru/yandex/passport/tvmauth/internal/LogFetcher$Message");
-        jobjectArray res = jenv->NewObjectArray(
-            messages.size(),
-            cls,
-            nullptr);
-
-        const jfieldID lvlFld = jenv->GetFieldID(cls, "lvl", "I");
-        const jfieldID msgFld = jenv->GetFieldID(cls, "msg", "Ljava/lang/String;");
-
-        for (size_t idx = 0; idx < messages.size(); ++idx) {
-            jobject message = jenv->AllocObject(cls);
-
-            jenv->SetIntField(
-                message,
-                lvlFld,
-                messages[idx].first);
-
-            jenv->SetObjectField(
-                message,
-                msgFld,
-                jenv->NewStringUTF(messages[idx].second.c_str()));
-
-            jenv->SetObjectArrayElement(res, idx, message);
-        }
-
-        return res;
-    });
-}
-
-jlong Java_ru_yandex_passport_tvmauth_internal_LogFetcher_factory(
-    JNIEnv* jenv,
-    jclass) {
-    return CatchAndRethrowExceptions(jenv, [=]() -> jlong {
-        return (jlong) new TJavaLogger;
-    });
-}
-
-void Java_ru_yandex_passport_tvmauth_internal_LogFetcher_dispose(
-    JNIEnv* jenv,
-    jclass,
-    jlong jobj) {
-    CatchAndRethrowExceptions(jenv, [=]() -> void {
-        delete reinterpret_cast<TJavaLogger*>(jobj);
-    });
-}
diff --git a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_internal_LogFetcher.h b/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_internal_LogFetcher.h
deleted file mode 100644
index c61055effb8..00000000000
--- a/library/java/tvmauth/src/c/ru_yandex_passport_tvmauth_internal_LogFetcher.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class ru_yandex_passport_tvmauth_internal_LogFetcher */
-
-#ifndef _Included_ru_yandex_passport_tvmauth_internal_LogFetcher
-    #define _Included_ru_yandex_passport_tvmauth_internal_LogFetcher
-    #ifdef __cplusplus
-extern "C" {
-    #endif
-    /*
-     * Class:     ru_yandex_passport_tvmauth_internal_LogFetcher
-     * Method:    factory
-     * Signature: ()J
-     */
-    JNIEXPORT jlong JNICALL Java_ru_yandex_passport_tvmauth_internal_LogFetcher_factory(JNIEnv*, jclass);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_internal_LogFetcher
-     * Method:    dispose
-     * Signature: (J)V
-     */
-    JNIEXPORT void JNICALL Java_ru_yandex_passport_tvmauth_internal_LogFetcher_dispose(JNIEnv*, jclass, jlong);
-
-    /*
-     * Class:     ru_yandex_passport_tvmauth_internal_LogFetcher
-     * Method:    fetch
-     * Signature: (J)[Lru/yandex/passport/tvmauth/internal/LogFetcher/Message;
-     */
-    JNIEXPORT jobjectArray JNICALL Java_ru_yandex_passport_tvmauth_internal_LogFetcher_fetch(JNIEnv*, jclass, jlong);
-
-    #ifdef __cplusplus
-}
-    #endif
-#endif
diff --git a/library/java/tvmauth/src/c/tvmauth.exports b/library/java/tvmauth/src/c/tvmauth.exports
deleted file mode 100644
index ee85dab7240..00000000000
--- a/library/java/tvmauth/src/c/tvmauth.exports
+++ /dev/null
@@ -1,48 +0,0 @@
-C Java_ru_yandex_passport_tvmauth_deprecated_ServiceContext_checkNative
-C Java_ru_yandex_passport_tvmauth_deprecated_ServiceContext_dispose
-C Java_ru_yandex_passport_tvmauth_deprecated_ServiceContext_factory
-C Java_ru_yandex_passport_tvmauth_deprecated_ServiceContext_signCgiParamsForTvmNative
-C Java_ru_yandex_passport_tvmauth_deprecated_UserContext_checkNative
-C Java_ru_yandex_passport_tvmauth_deprecated_UserContext_dispose
-C Java_ru_yandex_passport_tvmauth_deprecated_UserContext_factory
-C Java_ru_yandex_passport_tvmauth_DynamicClient_addDstsNative
-C Java_ru_yandex_passport_tvmauth_DynamicClient_factoryDynamicClientNative
-C Java_ru_yandex_passport_tvmauth_DynamicClient_getOptionalServiceTicketForTvmIdNative
-C Java_ru_yandex_passport_tvmauth_internal_LogFetcher_dispose
-C Java_ru_yandex_passport_tvmauth_internal_LogFetcher_factory
-C Java_ru_yandex_passport_tvmauth_internal_LogFetcher_fetch
-C Java_ru_yandex_passport_tvmauth_NativeTvmClient_checkServiceTicketNative
-C Java_ru_yandex_passport_tvmauth_NativeTvmClient_checkUserTicketNative
-C Java_ru_yandex_passport_tvmauth_NativeTvmClient_checkUserTicketNativeWithOverridedEnv
-C Java_ru_yandex_passport_tvmauth_NativeTvmClient_dispose
-C Java_ru_yandex_passport_tvmauth_NativeTvmClient_factoryTvmApi
-C Java_ru_yandex_passport_tvmauth_NativeTvmClient_factoryTvmTool
-C Java_ru_yandex_passport_tvmauth_NativeTvmClient_getRolesNative
-C Java_ru_yandex_passport_tvmauth_NativeTvmClient_getServiceTicketForAlias
-C Java_ru_yandex_passport_tvmauth_NativeTvmClient_getServiceTicketForTvmId
-C Java_ru_yandex_passport_tvmauth_NativeTvmClient_getStatusNative
-C Java_ru_yandex_passport_tvmauth_TvmApiSettings_dispose
-C Java_ru_yandex_passport_tvmauth_TvmApiSettings_enableServiceTicketCheckingNative
-C Java_ru_yandex_passport_tvmauth_TvmApiSettings_enableServiceTicketsFetchOptionsWithAliases
-C Java_ru_yandex_passport_tvmauth_TvmApiSettings_enableServiceTicketsFetchOptionsWithTvmIds
-C Java_ru_yandex_passport_tvmauth_TvmApiSettings_enableUserTicketCheckingNative
-C Java_ru_yandex_passport_tvmauth_TvmApiSettings_factory
-C Java_ru_yandex_passport_tvmauth_TvmApiSettings_fetchRolesForIdmSystemSlugNative
-C Java_ru_yandex_passport_tvmauth_TvmApiSettings_setDiskCacheDirNative
-C Java_ru_yandex_passport_tvmauth_TvmApiSettings_setSelfTvmIdNative
-C Java_ru_yandex_passport_tvmauth_TvmApiSettings_setTiroleConnectionParamsNative
-C Java_ru_yandex_passport_tvmauth_TvmApiSettings_setTvmHostPortNative
-C Java_ru_yandex_passport_tvmauth_TvmApiSettings_shouldCheckDefaultUidNative
-C Java_ru_yandex_passport_tvmauth_TvmApiSettings_shouldCheckSrcNative
-C Java_ru_yandex_passport_tvmauth_TvmToolSettings_dispose
-C Java_ru_yandex_passport_tvmauth_TvmToolSettings_factory
-C Java_ru_yandex_passport_tvmauth_TvmToolSettings_overrideBlackboxEnv
-C Java_ru_yandex_passport_tvmauth_TvmToolSettings_setAuthTokenNative
-C Java_ru_yandex_passport_tvmauth_TvmToolSettings_setHostnameNative
-C Java_ru_yandex_passport_tvmauth_TvmToolSettings_setPortNative
-C Java_ru_yandex_passport_tvmauth_TvmToolSettings_shouldCheckDefaultUidNative
-C Java_ru_yandex_passport_tvmauth_TvmToolSettings_shouldCheckSrcNative
-C Java_ru_yandex_passport_tvmauth_Unittest_createServiceTicketNative
-C Java_ru_yandex_passport_tvmauth_Unittest_createUserTicketNative
-C Java_ru_yandex_passport_tvmauth_Utils_removeTicketSignature
-C Java_ru_yandex_passport_tvmauth_Version_get
diff --git a/library/java/tvmauth/src/c/util.cpp b/library/java/tvmauth/src/c/util.cpp
deleted file mode 100644
index 0a735501321..00000000000
--- a/library/java/tvmauth/src/c/util.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-#include "util.h"
-
-#include <util/generic/maybe.h>
-
-#include <map>
-
-namespace NTvmAuthJava {
-    // https://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/types.html
-
-    static const std::map<NTvmAuth::ETicketStatus, TString> TICKET_STATUSES = {
-        {NTvmAuth::ETicketStatus::Ok, "OK"},
-        {NTvmAuth::ETicketStatus::Expired, "EXPIRED"},
-        {NTvmAuth::ETicketStatus::InvalidBlackboxEnv, "INVALID_BLACKBOX_ENV"},
-        {NTvmAuth::ETicketStatus::InvalidDst, "INVALID_DST"},
-        {NTvmAuth::ETicketStatus::InvalidTicketType, "INVALID_TICKET_TYPE"},
-        {NTvmAuth::ETicketStatus::Malformed, "MALFORMED"},
-        {NTvmAuth::ETicketStatus::MissingKey, "MISSING_KEY"},
-        {NTvmAuth::ETicketStatus::SignBroken, "SIGN_BROKEN"},
-        {NTvmAuth::ETicketStatus::UnsupportedVersion, "UNSUPPORTED_VERSION"},
-        {NTvmAuth::ETicketStatus::NoRoles, "NO_ROLES"},
-    };
-
-    static const char* TicketStatusToName(NTvmAuth::ETicketStatus s) {
-        auto it = TICKET_STATUSES.find(s);
-        Y_VERIFY(it != TICKET_STATUSES.end());
-        return it->second.c_str();
-    }
-
-    static const std::map<NTvmAuth::TClientStatus::ECode, TString> CLIENT_STATUSES = {
-        {NTvmAuth::TClientStatus::ECode::Ok, "OK"},
-        {NTvmAuth::TClientStatus::ECode::Warning, "WARNING"},
-        {NTvmAuth::TClientStatus::ECode::Error, "ERROR"},
-    };
-
-    static const char* ClientStatusToName(NTvmAuth::TClientStatus::ECode s) {
-        auto it = CLIENT_STATUSES.find(s);
-        Y_VERIFY(it != CLIENT_STATUSES.end());
-        return it->second.c_str();
-    }
-
-    static const std::map<NTvmAuth::EBlackboxEnv, TString> BLACKBOX_ENV = {
-        {NTvmAuth::EBlackboxEnv::Prod, "PROD"},
-        {NTvmAuth::EBlackboxEnv::Test, "TEST"},
-        {NTvmAuth::EBlackboxEnv::ProdYateam, "PROD_YATEAM"},
-        {NTvmAuth::EBlackboxEnv::TestYateam, "TEST_YATEAM"},
-        {NTvmAuth::EBlackboxEnv::Stress, "STRESS"},
-    };
-
-    static const char* BlackboxEnvToName(NTvmAuth::EBlackboxEnv e) {
-        auto it = BLACKBOX_ENV.find(e);
-        Y_VERIFY(it != BLACKBOX_ENV.end());
-        return it->second.c_str();
-    }
-
-    void SetTicketStatus(JNIEnv* jenv, const NTvmAuth::ETicketStatus status, jclass cls, jobject res) {
-        jclass statusClass = jenv->FindClass("ru/yandex/passport/tvmauth/TicketStatus");
-
-        jfieldID statusValue = jenv->GetStaticFieldID(
-            statusClass,
-            TicketStatusToName(status),
-            "Lru/yandex/passport/tvmauth/TicketStatus;");
-        jobject value = jenv->GetStaticObjectField(statusClass, statusValue);
-
-        jenv->SetObjectField(
-            res,
-            jenv->GetFieldID(cls, "status", "Lru/yandex/passport/tvmauth/TicketStatus;"),
-            value);
-    }
-
-    void SetClientStatus(JNIEnv* jenv,
-                         const NTvmAuth::TClientStatus::ECode status,
-                         jclass cls,
-                         jobject res) {
-        jclass statusClass = jenv->FindClass("ru/yandex/passport/tvmauth/ClientStatus$Code");
-
-        jfieldID statusValue = jenv->GetStaticFieldID(
-            statusClass,
-            ClientStatusToName(status),
-            "Lru/yandex/passport/tvmauth/ClientStatus$Code;");
-        jobject value = jenv->GetStaticObjectField(statusClass, statusValue);
-
-        jenv->SetObjectField(
-            res,
-            jenv->GetFieldID(cls, "code", "Lru/yandex/passport/tvmauth/ClientStatus$Code;"),
-            value);
-    }
-
-    jobject BuildJavaObject(JNIEnv* jenv, const NTvmAuth::TCheckedServiceTicket& ticket) {
-        jclass cls = jenv->FindClass("ru/yandex/passport/tvmauth/CheckedServiceTicket");
-        jobject res = jenv->AllocObject(cls);
-
-        const NTvmAuth::ETicketStatus status = ticket.GetStatus();
-        SetTicketStatus(jenv, status, cls, res);
-
-        jenv->SetObjectField(
-            res,
-            jenv->GetFieldID(cls, "debugInfo", "Ljava/lang/String;"),
-            jenv->NewStringUTF(ticket.DebugInfo().c_str()));
-
-        if (status == NTvmAuth::ETicketStatus::Ok) {
-            jenv->SetIntField(
-                res,
-                jenv->GetFieldID(cls, "src", "I"),
-                ticket.GetSrc());
-
-            TMaybe<NTvmAuth::TUid> issuerUid = ticket.GetIssuerUid();
-            jenv->SetLongField(
-                res,
-                jenv->GetFieldID(cls, "issuerUid", "J"),
-                issuerUid ? *issuerUid : 0);
-        }
-
-        return res;
-    }
-
-    jobject BuildJavaObject(JNIEnv* jenv, const NTvmAuth::TCheckedUserTicket& ticket) {
-        jclass cls = jenv->FindClass("ru/yandex/passport/tvmauth/CheckedUserTicket");
-        jobject res = jenv->AllocObject(cls);
-
-        const NTvmAuth::ETicketStatus status = ticket.GetStatus();
-        SetTicketStatus(jenv, status, cls, res);
-
-        jenv->SetObjectField(
-            res,
-            jenv->GetFieldID(cls, "debugInfo", "Ljava/lang/String;"),
-            jenv->NewStringUTF(ticket.DebugInfo().c_str()));
-
-        if (status == NTvmAuth::ETicketStatus::Ok) {
-            jenv->SetLongField(
-                res,
-                jenv->GetFieldID(cls, "defaultUid", "J"),
-                ticket.GetDefaultUid());
-
-            jlongArray uids = jenv->NewLongArray(ticket.GetUids().size());
-            jenv->SetLongArrayRegion(uids, 0, ticket.GetUids().size(), reinterpret_cast<const jlong*>(ticket.GetUids().data()));
-            jenv->SetObjectField(
-                res,
-                jenv->GetFieldID(cls, "uids", "[J"),
-                uids);
-
-            jobjectArray scopes = jenv->NewObjectArray(ticket.GetScopes().size(),
-                                                       jenv->FindClass("java/lang/String"),
-                                                       0);
-            const auto& scopesVector = ticket.GetScopes();
-            for (size_t idx = 0; idx < scopesVector.size(); ++idx) {
-                jenv->SetObjectArrayElement(scopes, idx, jenv->NewStringUTF(scopesVector[idx].data()));
-            }
-            jenv->SetObjectField(
-                res,
-                jenv->GetFieldID(cls, "scopes", "[Ljava/lang/String;"),
-                scopes);
-
-            {
-                jclass envClass = jenv->FindClass("ru/yandex/passport/tvmauth/BlackboxEnv");
-
-                jfieldID envValue = jenv->GetStaticFieldID(
-                    envClass,
-                    BlackboxEnvToName(ticket.GetEnv()),
-                    "Lru/yandex/passport/tvmauth/BlackboxEnv;");
-                jobject value = jenv->GetStaticObjectField(envClass, envValue);
-
-                jenv->SetObjectField(
-                    res,
-                    jenv->GetFieldID(cls, "env", "Lru/yandex/passport/tvmauth/BlackboxEnv;"),
-                    value);
-            }
-        }
-
-        return res;
-    }
-}
diff --git a/library/java/tvmauth/src/c/util.h b/library/java/tvmauth/src/c/util.h
deleted file mode 100644
index cae768f4736..00000000000
--- a/library/java/tvmauth/src/c/util.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#pragma once
-
-#include <library/cpp/tvmauth/checked_service_ticket.h>
-#include <library/cpp/tvmauth/checked_user_ticket.h>
-#include <library/cpp/tvmauth/exception.h>
-#include <library/cpp/tvmauth/client/client_status.h>
-#include <library/cpp/tvmauth/client/exception.h>
-#include <library/cpp/tvmauth/client/logger.h>
-
-#include <util/generic/vector.h>
-#include <util/thread/lfqueue.h>
-
-#include <exception>
-
-#include <jni.h>
-
-namespace NTvmAuthJava {
-    template <class T>
-    auto CatchAndRethrowExceptions(JNIEnv* jenv, T lambda) -> decltype(lambda()) {
-        using namespace NTvmAuth;
-
-        try {
-            return lambda();
-        } catch (const TEmptyTvmKeysException& ex) {
-            jenv->ThrowNew(jenv->FindClass("ru/yandex/passport/tvmauth/exception/EmptyTvmKeysException"),
-                           ex.what());
-        } catch (const TMalformedTvmKeysException& ex) {
-            jenv->ThrowNew(jenv->FindClass("ru/yandex/passport/tvmauth/exception/MalformedTvmKeysException"),
-                           ex.what());
-        } catch (const TMalformedTvmSecretException& ex) {
-            jenv->ThrowNew(jenv->FindClass("ru/yandex/passport/tvmauth/exception/MalformedTvmSecretException"),
-                           ex.what());
-        } catch (const TNotAllowedException& ex) {
-            jenv->ThrowNew(jenv->FindClass("ru/yandex/passport/tvmauth/exception/NotAllowedException"),
-                           ex.what());
-        } catch (const TPermissionDenied& ex) {
-            jenv->ThrowNew(jenv->FindClass("ru/yandex/passport/tvmauth/exception/PermissionDenied"),
-                           ex.what());
-        } catch (const TMissingServiceTicket& ex) {
-            jenv->ThrowNew(jenv->FindClass("ru/yandex/passport/tvmauth/exception/MissingServiceTicket"),
-                           ex.what());
-        } catch (const TBrokenTvmClientSettings& ex) {
-            jenv->ThrowNew(jenv->FindClass("ru/yandex/passport/tvmauth/exception/BrokenTvmClientSettings"),
-                           ex.what());
-        } catch (const TNonRetriableException& ex) {
-            jenv->ThrowNew(jenv->FindClass("ru/yandex/passport/tvmauth/exception/NonRetriableException"),
-                           ex.what());
-        } catch (const TRetriableException& ex) {
-            jenv->ThrowNew(jenv->FindClass("ru/yandex/passport/tvmauth/exception/RetriableException"),
-                           ex.what());
-        } catch (const TClientException& ex) {
-            jenv->ThrowNew(jenv->FindClass("ru/yandex/passport/tvmauth/exception/ClientException"),
-                           ex.what());
-        } catch (const std::exception& ex) {
-            jenv->ThrowNew(jenv->FindClass("java/lang/Exception"),
-                           ex.what());
-        } catch (...) {
-            jenv->ThrowNew(jenv->FindClass("java/lang/Exception"),
-                           "Unknown exception");
-        }
-        return decltype(lambda())();
-    }
-
-    class TJavaString {
-    public:
-        TJavaString(JNIEnv* jenv, jstring orig)
-            : jenv_(jenv)
-            , orig_(orig)
-            , k_(jenv_->GetStringUTFChars(orig_, nullptr))
-        {
-        }
-
-        ~TJavaString() {
-            jenv_->ReleaseStringUTFChars(orig_, k_);
-        }
-
-        operator TStringBuf() const {
-            return TStringBuf(k_, jenv_->GetStringUTFLength(orig_));
-        }
-
-    private:
-        JNIEnv* jenv_;
-        jstring orig_;
-        const char* k_;
-    };
-
-    class TJavaLogger: public NTvmAuth::ILogger {
-    public:
-        TJavaLogger() {
-            Ref(); // to avoid deletion by intrusive ptr
-        }
-
-        using TMessage = std::pair<int, TString>;
-
-        void Log(int lvl, const TString& msg) override {
-            queue_.Enqueue(TMessage{lvl, msg});
-        }
-
-        TVector<TMessage> FetchMessages() {
-            TVector<TMessage> res;
-            queue_.DequeueAll(&res);
-            return res;
-        }
-
-    private:
-        TLockFreeQueue<TMessage> queue_;
-    };
-
-    jobject BuildJavaObject(JNIEnv* jenv, const NTvmAuth::TCheckedServiceTicket& ticket);
-    jobject BuildJavaObject(JNIEnv* jenv, const NTvmAuth::TCheckedUserTicket& ticket);
-
-    void SetTicketStatus(JNIEnv* jenv, const NTvmAuth::ETicketStatus status, jclass cls, jobject res);
-    void SetClientStatus(JNIEnv* jenv, const NTvmAuth::TClientStatus::ECode status, jclass cls, jobject res);
-}
diff --git a/library/java/tvmauth/src/main/java/README.md b/library/java/tvmauth/src/main/java/README.md
deleted file mode 100644
index 610ccfb7c0d..00000000000
--- a/library/java/tvmauth/src/main/java/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-To generate JNI headers:
-javah ru.yandex.passport.tvmauth.TvmToolSettings
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/BlackboxEnv.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/BlackboxEnv.java
deleted file mode 100644
index df33cff3844..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/BlackboxEnv.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-/**
- * BlackboxEnv describes environment of Passport:
- * https://wiki.yandex-team.ru/passport/tvm2/user-ticket/#0-opredeljaemsjasokruzhenijami
- */
-public enum BlackboxEnv {
-    PROD,
-    TEST,
-    PROD_YATEAM,
-    TEST_YATEAM,
-    STRESS,
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/BlackboxTvmId.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/BlackboxTvmId.java
deleted file mode 100644
index b94f68ff825..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/BlackboxTvmId.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-public enum BlackboxTvmId {
-    PROD(222),
-    TEST(224),
-    PROD_YATEAM(223),
-    TEST_YATEAM(225),
-    STRESS(226),
-    MIMINO(239);
-
-    private final int dstTvmId;
-
-    BlackboxTvmId(int dstTvmId) {
-        this.dstTvmId = dstTvmId;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(dstTvmId);
-    }
-
-    public int getDstTvmId() {
-        return dstTvmId;
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/CheckedServiceTicket.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/CheckedServiceTicket.java
deleted file mode 100644
index da1ec4f938d..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/CheckedServiceTicket.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import javax.annotation.Nonnull;
-
-import ru.yandex.passport.tvmauth.exception.NotAllowedException;
-
-public class CheckedServiceTicket {
-    private TicketStatus status;
-    private String debugInfo;
-    private int src;
-    private long issuerUid;
-
-    // TODO: PASSP-30786
-    // Drop it
-    public CheckedServiceTicket(TicketStatus status, String debugInfo, int src, long issuerUid) {
-        this.status = status;
-        this.debugInfo = debugInfo;
-        this.src = src;
-        this.issuerUid = issuerUid;
-    }
-
-    @Nonnull
-    public String debugInfo() {
-        return debugInfo;
-    }
-
-    /**
-    * @return uid of developer, who got CheckedServiceTicket with grant_type=sshkey. Maybe 0 if issuer uid is absent
-    */
-    public long getIssuerUid() {
-        checkStatus();
-        return issuerUid;
-    }
-
-    public boolean booleanValue() {
-        return status == TicketStatus.OK;
-    }
-
-    /**
-     * You should check src with your ACL
-     * @return tvmId of request source
-     */
-    public int getSrc() {
-        checkStatus();
-        return src;
-    }
-
-    @Nonnull
-    public TicketStatus getStatus() {
-        return status;
-    }
-
-    private void checkStatus() {
-        if (!this.booleanValue()) {
-            throw new NotAllowedException("Ticket is not valid");
-        }
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/CheckedUserTicket.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/CheckedUserTicket.java
deleted file mode 100644
index d4f24c12589..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/CheckedUserTicket.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import java.util.Arrays;
-
-import javax.annotation.Nonnull;
-
-import ru.yandex.passport.tvmauth.exception.NotAllowedException;
-
-public class CheckedUserTicket {
-    private TicketStatus status;
-    private String debugInfo;
-    private String[] scopes;
-    private long defaultUid;
-    private long[] uids;
-    private BlackboxEnv env;
-
-    // TODO: PASSP-30786
-    // Drop it
-    public CheckedUserTicket(TicketStatus status, String debugInfo, String[] scopes, long defaultUid, long[] uids) {
-        this.status = status;
-        this.debugInfo = debugInfo;
-        this.scopes = scopes;
-        this.defaultUid = defaultUid;
-        this.uids = uids;
-    }
-
-    public boolean booleanValue() {
-        return status == TicketStatus.OK;
-    }
-
-    @Nonnull
-    public String debugInfo() {
-        return debugInfo;
-    }
-
-    public boolean hasScope(@Nonnull String scopeName) {
-        checkStatus();
-        return Arrays.binarySearch(scopes, scopeName) >= 0;
-    }
-
-    /**
-     * @return default user - may be 0
-     */
-    public long getDefaultUid() {
-        checkStatus();
-        return defaultUid;
-    }
-
-    /**
-     * Never empty
-     * @return array of scopes inherited from credential
-     */
-    @Nonnull
-    public String[] getScopes() {
-        checkStatus();
-        return scopes;
-    }
-
-    /**
-     * Never empty
-     * @return array of valid users
-     */
-    @Nonnull
-    public long[] getUids() {
-        checkStatus();
-        return uids;
-    }
-
-    @Nonnull
-    public BlackboxEnv getEnv() {
-        checkStatus();
-        return env;
-    }
-
-    @Nonnull
-    public TicketStatus getStatus() {
-        return status;
-    }
-
-    private void checkStatus() {
-        if (!this.booleanValue()) {
-            throw new NotAllowedException("Ticket is not valid");
-        }
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/ClientStatus.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/ClientStatus.java
deleted file mode 100644
index d2838f7e037..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/ClientStatus.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import javax.annotation.Nonnull;
-
-public class ClientStatus {
-    private Code code;
-    private String lastError;
-
-    public enum Code {
-        OK,
-        WARNING,
-        ERROR,
-    }
-
-    public ClientStatus(@Nonnull Code code, @Nonnull String lastError) {
-        this.code = code;
-        this.lastError = lastError;
-    }
-
-    @Nonnull
-    public Code getCode() {
-        return code;
-    }
-
-    @Nonnull
-    public String getLastError() {
-        return lastError;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-
-        if (obj.getClass() == Code.class) {
-            return this.code == (Code) obj;
-        }
-        if (obj.getClass() != this.getClass()) {
-            return false;
-        }
-
-        final ClientStatus other = (ClientStatus) obj;
-        if (other.lastError == null || other.code == null) {
-            return false;
-        }
-        return this.code == other.code && this.lastError.equals(other.lastError);
-    }
-
-    @Override
-    public int hashCode() {
-        return code.hashCode() + lastError.hashCode();
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/NativeTvmClient.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/NativeTvmClient.java
deleted file mode 100644
index a1cd7a54d17..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/NativeTvmClient.java
+++ /dev/null
@@ -1,308 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import javax.annotation.Nonnull;
-
-import ru.yandex.passport.tvmauth.internal.JniUtils;
-import ru.yandex.passport.tvmauth.internal.LogFetcher;
-import ru.yandex.passport.tvmauth.internal.NativeHandle;
-import ru.yandex.passport.tvmauth.roles.Roles;
-import ru.yandex.passport.tvmauth.roles.RolesParser;
-
-/**
- * Long lived thread-safe object for interacting with TVM. Each client starts system thread.
- *
- * In 99% cases NativeTvmClient shoud be created at service startup and live for the whole process lifetime.
- * If your case in this 1% and you need to RESTART client, you should to use method 'stop()' for old client.
- *
- * If you don't like method 'finalize()', you can destroy object manaully with method 'close()':
- * after that method 'finalize()' will be no-op.
- */
-public class NativeTvmClient extends NativeHandle implements TvmClient {
-    private Thread thread;
-    private Task task;
-    private Roles roles;
-    private ReentrantReadWriteLock rolesLock = new ReentrantReadWriteLock();
-
-    /**
-     * Uses local http-interface to get state: http://localhost/tvm/.
-     * This interface can be provided with tvmtool (local daemon) or Qloud/YP (local http api in container).
-     * See more: https://wiki.yandex-team.ru/passport/tvm2/tvm-daemon/.
-     *
-     * Logs stored in org.slf4j.Logger
-     *
-     * Starts thread for updating of in-memory cache in background
-     * @param settings
-     */
-    public NativeTvmClient(@Nonnull TvmToolSettings settings) {
-        LogFetcher log = new LogFetcher();
-        try {
-            this.nativeHandle = factoryTvmTool(settings.getHandle(), log.getHandle());
-        } finally {
-            log.run();
-        }
-
-        this.startThread(log);
-    }
-
-    /**
-     * Uses general way to get state: https://tvm-api.yandex.net.
-     * It is not recommended for Qloud/YP.
-     *
-     * Logs stored in org.slf4j.Logger
-     *
-     * Starts thread for updating of in-memory cache in background
-     * Reads cache from disk if specified
-     * @param settings
-     */
-    public NativeTvmClient(@Nonnull TvmApiSettings settings) {
-        LogFetcher log = new LogFetcher();
-        try {
-            this.nativeHandle = factoryTvmApi(settings.getHandle(), log.getHandle());
-        } finally {
-            log.run();
-        }
-
-        this.startThread(log);
-    }
-
-    /**
-      * For DynamicClient
-      */
-    protected NativeTvmClient() {
-    }
-
-    @Nonnull
-    public static NativeTvmClient create(@Nonnull TvmToolSettings settings) {
-        return new NativeTvmClient(settings);
-    }
-    @Nonnull
-    public static NativeTvmClient create(@Nonnull TvmApiSettings settings) {
-        return new NativeTvmClient(settings);
-    }
-
-    /**
-     * You should trigger your monitoring if status is not Ok.
-     * It will be unable to operate if status is Error.
-     * Description: https://a.yandex-team.ru/arc/trunk/arcadia/library/java/tvmauth/client/README.md#NativeTvmClient
-     * @return Current status of client.
-     */
-    @Override
-    @Nonnull
-    public ClientStatus getStatus() {
-        rwlock.readLock().lock();
-        try {
-            return getStatusNative(getNativeHandle());
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-
-    /**
-     * Requires fetching options (from TClientSettings or Qloud/YP/tvmtool settings)
-     * Can throw exception if cache is invalid or wrong config
-     * @param dst - alias specified in settings or tvmtool
-     */
-    @Override
-    @Nonnull
-    public String getServiceTicketFor(@Nonnull String alias) {
-        rwlock.readLock().lock();
-        try {
-            return getServiceTicketForAlias(getNativeHandle(), alias);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-
-    /**
-     * Requires fetching options (from TClientSettings or Qloud/YP/tvmtool settings)
-     * Can throw exception if cache is invalid or wrong config
-     * @param dst - tvmId specified in settings or tvmtool
-     */
-    @Override
-    @Nonnull
-    public String getServiceTicketFor(int tvmId) {
-        rwlock.readLock().lock();
-        try {
-            return getServiceTicketForTvmId(getNativeHandle(), tvmId);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-
-    /**
-     * For TTvmApi::TClientSettings: checking must be enabled in TClientSettings
-     * Can throw exception if checking was not enabled in settings
-     * @param ticketBody
-     */
-    @Override
-    @Nonnull
-    public CheckedServiceTicket checkServiceTicket(@Nonnull String ticketBody) {
-        rwlock.readLock().lock();
-        try {
-            return checkServiceTicketNative(getNativeHandle(), ticketBody);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-
-    /**
-     * Requires blackbox environment (from TClientSettings or Qloud/YP/tvmtool settings)
-     * Can throw exception if checking was not enabled in settings
-     * @param ticketBody
-     */
-    @Override
-    @Nonnull
-    public CheckedUserTicket checkUserTicket(@Nonnull String ticketBody) {
-        rwlock.readLock().lock();
-        try {
-            return checkUserTicketNative(getNativeHandle(), ticketBody);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-
-    /**
-     * Requires blackbox environment (from TClientSettings or Qloud/YP/tvmtool settings)
-     * Can throw exception if checking was not enabled in settings
-     * @param ticketBody
-     */
-    @Nonnull
-    public CheckedUserTicket checkUserTicket(@Nonnull String ticketBody, @Nonnull BlackboxEnv overridedBbEnv) {
-        rwlock.readLock().lock();
-        try {
-            return checkUserTicketNativeWithOverridedEnv(getNativeHandle(), ticketBody, overridedBbEnv.ordinal());
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-
-    @Nonnull
-    public Roles getRoles() {
-        rwlock.readLock().lock();
-        try {
-            rolesLock.readLock().lock();
-            Roles currentRoles = roles;
-            rolesLock.readLock().unlock();
-
-            String currentRevision = null;
-            if (currentRoles != null) {
-                currentRevision = currentRoles.getMeta().getRevision();
-            }
-
-            String newRoles = getRolesNative(getNativeHandle(), currentRevision);
-            if (newRoles == null) {
-                return currentRoles;
-            }
-
-            rolesLock.writeLock().lock();
-            try {
-                // already updated
-                if (currentRoles != roles) {
-                    return roles;
-                }
-
-                roles = RolesParser.parse(newRoles);
-                return roles;
-            } finally {
-                rolesLock.writeLock().unlock();
-            }
-
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-
-    /**
-      * First call will delete object. Next calls will be no-op.
-      */
-    @Override
-    public void close() {
-        rwlock.writeLock().lock();
-
-        try {
-            if (this.task != null) {
-                this.task.terminate();
-                this.thread.interrupt();
-            }
-
-            dispose(nativeHandle);
-            this.nativeHandle = 0;
-
-            if (this.task != null) {
-                this.task.doJob();
-                this.task.destroy();
-                this.task = null;
-            }
-        } finally {
-            rwlock.writeLock().unlock();
-        }
-    }
-
-    protected void startThread(LogFetcher log) {
-        this.task = new Task(log);
-        this.thread = new Thread(task, "NativeTvmClient");
-        this.thread.setDaemon(true);
-        this.thread.start();
-    }
-
-    protected void setNativeHandle(long nativeHandle) {
-        this.nativeHandle = nativeHandle;
-    }
-
-    @Override
-    protected void disposeHandle(long handle) {
-        dispose(handle);
-    }
-
-    private static native long factoryTvmApi(long settings, long logger);
-    private static native long factoryTvmTool(long settings, long logger);
-    private static native void dispose(long nativeHandle);
-    private static native ClientStatus getStatusNative(long nativeHandle);
-    private static native String getServiceTicketForAlias(long nativeHandle, String alias);
-    private static native String getServiceTicketForTvmId(long nativeHandle, int tvmId);
-    private static native CheckedServiceTicket checkServiceTicketNative(long nativeHandle, String ticketBody);
-    private static native CheckedUserTicket checkUserTicketNative(long nativeHandle, String ticketBody);
-    private static native CheckedUserTicket checkUserTicketNativeWithOverridedEnv(long nativeHandle,
-                                                                                  String ticketBody,
-                                                                                  int env);
-    private static native String getRolesNative(long nativeHandle, String revision);
-
-    static {
-        JniUtils.loadLibrary();
-    }
-}
-
-class Task implements Runnable {
-    private final LogFetcher log;
-    private volatile boolean running = true;
-
-    Task(LogFetcher log) {
-        this.log = log;
-    }
-
-    @Override
-    public void run() {
-        while (running) {
-            try {
-                Thread.sleep(500L);
-                this.doJob();
-            } catch (InterruptedException e) {
-                running = false;
-            }
-        }
-    }
-
-    public void doJob() {
-        this.log.run();
-    }
-
-    public void terminate() {
-        this.running = false;
-    }
-
-    public void destroy() {
-        this.log.close();
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/TicketStatus.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/TicketStatus.java
deleted file mode 100644
index 27925c672b2..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/TicketStatus.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-/**
- * TicketStatus mean result of ticket check
- */
-public enum TicketStatus {
-    OK,
-    EXPIRED,
-    INVALID_BLACKBOX_ENV,
-    INVALID_DST,
-    INVALID_TICKET_TYPE,
-    MALFORMED,
-    MISSING_KEY,
-    SIGN_BROKEN,
-    UNSUPPORTED_VERSION,
-    NO_ROLES,
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/TvmApiSettings.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/TvmApiSettings.java
deleted file mode 100644
index bb721bc2598..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/TvmApiSettings.java
+++ /dev/null
@@ -1,305 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import ru.yandex.passport.tvmauth.internal.JniUtils;
-import ru.yandex.passport.tvmauth.internal.NativeHandle;
-
-/**
- * Settings for TVM client. Uses https://tvm-api.yandex.net to get state.
- * At least one of them is required:
- *     enableServiceTicketChecking()
- *     enableUserTicketChecking()
- *     enableServiceTicketsFetchOptions()
- */
-public final class TvmApiSettings extends NativeHandle {
-
-    public TvmApiSettings() {
-        this.nativeHandle = factory();
-    }
-    @Nonnull
-    public static TvmApiSettings create() {
-        return new TvmApiSettings();
-    }
-
-    /**
-     * Required by enableServiceTicketChecking() and enableServiceTicketsFetchOptions()
-     * @param tvmId
-     * @return modified this
-     */
-    @Nonnull
-    public TvmApiSettings setSelfTvmId(int tvmId) {
-        rwlock.readLock().lock();
-
-        try {
-            setSelfTvmIdNative(getNativeHandle(), tvmId);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    /**
-     * Prerequires setSelfTvmId().
-     * This option enables fetching of public keys for signature checking.
-     * @return modified this
-     */
-    @Nonnull
-    public TvmApiSettings enableServiceTicketChecking() {
-        rwlock.readLock().lock();
-
-        try {
-            enableServiceTicketCheckingNative(getNativeHandle());
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    /**
-     * This option enables checking of UserTickets
-     *   and enables fetching of public keys for signature checking.
-     * @return modified this
-     */
-    @Nonnull
-    public TvmApiSettings enableUserTicketChecking(@Nonnull BlackboxEnv env) {
-        rwlock.readLock().lock();
-
-        try {
-            enableUserTicketCheckingNative(getNativeHandle(), env.ordinal());
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    /**
-     * Set path to directory for disk cache
-     * Requires read/write permissions. Checks permissions
-     * WARNING: The same directory can be used only:
-     *            - for TVM clients with the same settings
-     *          OR
-     *            - for new client replacing previous - with another config.
-     *          System user must be the same for processes with these clients inside.
-     *          Implementation doesn't provide other scenarios.
-     * @param dir
-     * @return modified this
-     */
-    @Nonnull
-    public TvmApiSettings setDiskCacheDir(@Nonnull String dir) {
-        rwlock.readLock().lock();
-
-        try {
-            setDiskCacheDirNative(getNativeHandle(), dir);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    /**
-     * Alias is internal name of destination in your code. It allows not to bring destination's
-     *  tvm_id to each calling point. Useful for several environments: prod/test/etc.
-     * @example:
-     *      static final String MY_BACKEND = "my backend";
-     *      ...
-     *      // init
-     *      HashMap<String,Integer> map = new HashMap<String,Integer>();
-     *      map.put(MY_BACKEND, config.getBackendId());
-     *      s.enableServiceTicketsFetchOptions(config.getSelfSecret, m);
-     *      ...
-     *      // per request
-     *      String t = tvmClient.setServiceTicketFor(MY_BACKEND);
-     *
-     * Set options for fetching Service Tickets from tvm-api
-     *  to allow you send them to your backends.
-     *
-     * WARNING: It is not way to provide authorization for incoming ServiceTickets!
-     *          It is way only to send your ServiceTickets to your backend!
-     *
-     * @param selfSecret
-     * @param dsts is map: alias -> tvmId
-     */
-    @Nonnull
-    public TvmApiSettings enableServiceTicketsFetchOptions(@Nonnull String selfSecret,
-                                                           @Nonnull Map<String, Integer> dsts) {
-        StringBuilder b = new StringBuilder(10 * dsts.size());
-        for (Map.Entry<String, Integer> d : dsts.entrySet()) {
-            b.append(d.getKey()).append(":").append(d.getValue()).append(";");
-        }
-
-        rwlock.readLock().lock();
-
-        try {
-            enableServiceTicketsFetchOptionsWithAliases(getNativeHandle(), selfSecret, b.toString());
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    /**
-     * Set options for fetching Service Tickets from tvm-api
-     *  to allow you send them to your backends.
-     *
-     * WARNING: It is not way to provide authorization for incoming ServiceTickets!
-     *          It is way only to send your ServiceTickets to your backend!
-     *
-     * @param selfSecret
-     * @param dsts is array of tvmIds
-     */
-    @Nonnull
-    public TvmApiSettings enableServiceTicketsFetchOptions(@Nonnull String selfSecret,
-                                                           int[] dsts) {
-        StringBuilder b = new StringBuilder(10 * dsts.length);
-        for (int d : dsts) {
-            b.append(d).append(";");
-        }
-
-        rwlock.readLock().lock();
-
-        try {
-            enableServiceTicketsFetchOptionsWithTvmIds(getNativeHandle(), selfSecret, b.toString());
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    @Nonnull
-    public TvmApiSettings fetchRolesForIdmSystemSlug(@Nonnull String slug) {
-        rwlock.readLock().lock();
-
-        try {
-            fetchRolesForIdmSystemSlugNative(getNativeHandle(), slug);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    /**
-     * By default client checks src from ServiceTicket or default uid from UserTicket -
-     *   to prevent you from forgetting to check it yourself.
-     * It does binary checks only:
-     *   ticket gets status NoRoles, if there is no role for src or default uid.
-     * You need to check roles on your own if you have a non-binary role system or
-     *     you have disabled ShouldCheckSrc/ShouldCheckDefaultUid
-     *
-     * You may need to disable this check in the following cases:
-     *   - You use GetRoles() to provide verbose message (with revision).
-     *     Double check may be inconsistent:
-     *       binary check inside client uses revision of roles X - i.e. src 100500 has no role,
-     *       exact check in your code uses revision of roles Y -  i.e. src 100500 has some roles.
-     *
-     * @param value
-     */
-    @Nonnull
-    public TvmApiSettings shouldCheckSrc(boolean value) {
-        rwlock.readLock().lock();
-
-        try {
-            shouldCheckSrcNative(getNativeHandle(), value);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    /**
-     * Look at shouldCheckSrc()
-     * @param value
-     */
-    @Nonnull
-    public TvmApiSettings shouldCheckDefaultUid(boolean value) {
-        rwlock.readLock().lock();
-
-        try {
-            shouldCheckDefaultUidNative(getNativeHandle(), value);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    /*!
-     * Should be used in tests for mocking tvmapi
-     */
-    @Nonnull
-    public TvmApiSettings setTvmPortForLocalhost(int port) {
-        return setTvmHostPort("localhost", port);
-    }
-
-    @Nonnull
-    public TvmApiSettings setTvmHostPort(@Nonnull String host, int port) {
-        rwlock.readLock().lock();
-
-        try {
-            setTvmHostPortNative(getNativeHandle(), host, port);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    @Nonnull
-    public TvmApiSettings setTiroleConnectionParams(@Nonnull String host, int port, int tvmid) {
-        rwlock.readLock().lock();
-
-        try {
-            setTiroleConnectionParamsNative(getNativeHandle(), host, port, tvmid);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    public long getHandle() {
-        rwlock.readLock().lock();
-        try {
-            return getNativeHandle();
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-
-    @Override
-    protected void disposeHandle(long handle) {
-        dispose(handle);
-    }
-
-    private static native long factory();
-    private static native void dispose(long nativeHandle);
-    private static native void setSelfTvmIdNative(long nativeHandle, int tvmId);
-    private static native void enableServiceTicketCheckingNative(long nativeHandle);
-    private static native void enableUserTicketCheckingNative(long nativeHandle, int env);
-    private static native void setDiskCacheDirNative(long nativeHandle, String dir);
-    private static native void enableServiceTicketsFetchOptionsWithAliases(long nativeHandle,
-                                                                           String selfSecret,
-                                                                           String dsts);
-    private static native void enableServiceTicketsFetchOptionsWithTvmIds(long nativeHandle,
-                                                                          String selfSecret,
-                                                                          String dsts);
-    private static native void fetchRolesForIdmSystemSlugNative(long nativeHandle, String slug);
-    private static native void shouldCheckSrcNative(long nativeHandle, boolean value);
-    private static native void shouldCheckDefaultUidNative(long nativeHandle, boolean value);
-    private static native void setTvmHostPortNative(long nativeHandle, String host, int port);
-    private static native void setTiroleConnectionParamsNative(long nativeHandle, String host, int port, int tvmid);
-
-    static {
-        JniUtils.loadLibrary();
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/TvmClient.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/TvmClient.java
deleted file mode 100644
index c03cd096348..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/TvmClient.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import ru.yandex.passport.tvmauth.roles.Roles;
-
-public interface TvmClient extends AutoCloseable {
-
-    ClientStatus getStatus();
-    String getServiceTicketFor(String alias);
-    String getServiceTicketFor(int tvmId);
-    CheckedServiceTicket checkServiceTicket(String ticketBody);
-    CheckedUserTicket checkUserTicket(String ticketBody);
-    CheckedUserTicket checkUserTicket(String ticketBody, BlackboxEnv overridedBbEnv);
-    Roles getRoles();
-
-    @Override
-    void close();
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/TvmToolSettings.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/TvmToolSettings.java
deleted file mode 100644
index c49e5fb6dae..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/TvmToolSettings.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import javax.annotation.Nonnull;
-
-import ru.yandex.passport.tvmauth.internal.JniUtils;
-import ru.yandex.passport.tvmauth.internal.NativeHandle;
-
-/**
- * Uses local http-interface to get state: http://localhost/tvm/.
- * This interface can be provided with tvmtool (local daemon) or Qloud/YP (local http api in container).
- * See more: https://wiki.yandex-team.ru/passport/tvm2/qloud/.
- *
- * Most part of settings will be fetched from tvmtool on start of client.
- * You need to use aliases for TVM-clients (src and dst) which you specified in tvmtool or Qloud/YP interface
- */
-public final class TvmToolSettings extends NativeHandle {
-    /**
-     * Sets default values:
-     * - hostname == "localhost"
-     * - port detected with env["DEPLOY_TVM_TOOL_URL"] (provided with Yandex.Deploy),
-     *      otherwise port == 1 (it is ok for Qloud).
-     * - authToken: env["TVMTOOL_LOCAL_AUTHTOKEN"] (provided with Yandex.Deploy),
-     *      otherwise env["QLOUD_TVM_TOKEN"] (provided with Qloud)
-     *
-     * AuthToken is protection from SSRF.
-     *
-     * @param selfAias - alias for your TVM client, which you specified in tvmtool or YD interface
-     */
-    public TvmToolSettings(@Nonnull String selfAlias) {
-        this.nativeHandle = factory(selfAlias);
-    }
-    @Nonnull
-    public static TvmToolSettings create(@Nonnull String selfAlias) {
-        return new TvmToolSettings(selfAlias);
-    }
-
-    /**
-     * Look at comment for ctor
-     * @param port
-     */
-    @Nonnull
-    public TvmToolSettings setPort(int port) {
-        rwlock.readLock().lock();
-
-        try {
-            setPortNative(getNativeHandle(), port);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    /**
-     * Default value: hostname == "localhost"
-     * @param hostname
-     */
-    @Nonnull
-    public TvmToolSettings setHostname(@Nonnull String hostname) {
-        rwlock.readLock().lock();
-
-        try {
-            setHostnameNative(getNativeHandle(), hostname);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    /**
-     * Look at comment for ctor
-     * @param token
-     */
-    @Nonnull
-    public TvmToolSettings setAuthToken(@Nonnull String authToken) {
-        rwlock.readLock().lock();
-
-        try {
-            setAuthTokenNative(getNativeHandle(), authToken);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    /*!
-      * Blackbox environment is provided by tvmtool for client.
-      * You can override it for your purpose with limitations:
-      *   (env from tvmtool) -> (override)
-      *  - Prod/ProdYateam -> Prod/ProdYateam
-      *  - Test/TestYateam -> Test/TestYateam
-      *  - Stress -> Stress
-      *
-      * You can contact [email protected] if limitations are too strict
-      * @param env
-      */
-    @Nonnull
-    public TvmToolSettings overrideBlackboxEnv(@Nonnull BlackboxEnv env) {
-        rwlock.readLock().lock();
-
-        try {
-            overrideBlackboxEnv(getNativeHandle(), env.ordinal());
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    /**
-     * By default client checks src from ServiceTicket or default uid from UserTicket -
-     *   to prevent you from forgetting to check it yourself.
-     * It does binary checks only:
-     *   ticket gets status NoRoles, if there is no role for src or default uid.
-     * You need to check roles on your own if you have a non-binary role system or
-     *     you have disabled ShouldCheckSrc/ShouldCheckDefaultUid
-     *
-     * You may need to disable this check in the following cases:
-     *   - You use GetRoles() to provide verbose message (with revision).
-     *     Double check may be inconsistent:
-     *       binary check inside client uses revision of roles X - i.e. src 100500 has no role,
-     *       exact check in your code uses revision of roles Y -  i.e. src 100500 has some roles.
-     *
-     * @param value
-     */
-    @Nonnull
-    public TvmToolSettings shouldCheckSrc(boolean value) {
-        rwlock.readLock().lock();
-
-        try {
-            shouldCheckSrcNative(getNativeHandle(), value);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    /**
-     * Look at shouldCheckSrc()
-     * @param value
-     */
-    @Nonnull
-    public TvmToolSettings shouldCheckDefaultUid(boolean value) {
-        rwlock.readLock().lock();
-
-        try {
-            shouldCheckDefaultUidNative(getNativeHandle(), value);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-
-        return this;
-    }
-
-    public long getHandle() {
-        rwlock.readLock().lock();
-        try {
-            return getNativeHandle();
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-
-    @Override
-    protected void disposeHandle(long handle) {
-        dispose(handle);
-    }
-
-    private static native long factory(String selfAlias);
-    private static native void dispose(long nativeHandle);
-    private static native void setPortNative(long nativeHandle, int port);
-    private static native void setHostnameNative(long nativeHandle, String hostname);
-    private static native void setAuthTokenNative(long nativeHandle, String authToken);
-    private static native void overrideBlackboxEnv(long nativeHandle, int env);
-    private static native void shouldCheckSrcNative(long nativeHandle, boolean value);
-    private static native void shouldCheckDefaultUidNative(long nativeHandle, boolean value);
-
-    static {
-        JniUtils.loadLibrary();
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/Unittest.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/Unittest.java
deleted file mode 100644
index d2bbe6ae802..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/Unittest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import javax.annotation.Nonnull;
-
-import ru.yandex.passport.tvmauth.internal.JniUtils;
-
-/**
- * Unittest should make easier proccess of creating tests
- */
-public class Unittest {
-    private static String tvmknifePublicKeys =
-        "1:CpgCCpMCCAEQABqIAjCCAQQCggEAcLEXeH67FQESFUn4_7wnX7wN0PUrBoUsm3QQ4W5vC-qz6sXaEjSwnTV8w1o-z6X9KPLlhzMQvuS38" +
-        "NCNfK4uvJ4Zvfp3YsXJ25-rYtbnrYJHNvHohD-kPCCw_yZpMp21JdWigzQGuV7CtrxUhF-NNrsnUaJrE5-OpEWNt4X6nCItKIYeVcSK6XJU" +
-        "bEWbrNCRbvkSc4ak2ymFeMuHYJVjxh4eQbk7_ZPzodP0WvF6eUYrYeb42imVEOR8ofVLQWE5DVnb1z_TqZm4i1XkS7jMwZuBxBRw8DGdYei" +
-        "0lT_sAf7KST2jC0590NySB3vsBgWEVs1OdUUWA6r-Dvx9dsOQtSCVkQYQAAqZAgqUAggCEAAaiQIwggEFAoIBAQDhEBM5-6YsPWfogKtblu" +
-        "JoCX1WV2KdzOaQ0-OlRbBzeCzw-eQKu12c8WakHBbeCMd1I1TU64SDkDorWjXGIa_2xT6N3zzNAE50roTbPCcmeQrps26woTYfYIuqDdoxY" +
-        "KZNr0lvNLLW47vBr7EKqo1S4KSj7aXK_XYeEvUgIgf3nVIcNrio7VTnFmGGVQCepaL1Hi1gN4yIXjVZ06PBPZ-DxSRu6xOGbFrfKMJeMPs7" +
-        "KOyE-26Q3xOXdTIa1X-zYIucTd_bxUCL4BVbwW2AvbbFsaG7ISmVdGu0XUTmhXs1KrEfUVLRJhE4Dx99hAZXm1_HlYMUeJcMQ_oHOhV94EN" +
-        "FIJaRBhACCpYBCpEBCAMQABqGATCBgwKBgF9t2YJGAJkRRFq6fWhi3m1TFW1UOE0f6ZrfYhHAkpqGlKlh0QVfeTNPpeJhi75xXzCe6oReRU" +
-        "m-0DbqDNhTShC7uGUv1INYnRBQWH6E-5Fc5XrbDFSuGQw2EYjNfHy_HefHJXxQKAqPvxBDKMKkHgV58WtM6rC8jRi9sdX_ig2NIJeRBhABC" +
-        "pYBCpEBCAQQABqGATCBgwKBgGB4d6eLGUBv-Q6EPLehC4S-yuE2HB-_rJ7WkeYwyp-xIPolPrd-PQme2utHB4ZgpXHIu_OFksDe_0bPgZni" +
-        "NRSVRbl7W49DgS5Ya3kMfrYB4DnF5Fta5tn1oV6EwxYD4JONpFTenOJALPGTPawxXEfon_peiHOSBuQMu3_Vn-l1IJiRBhADCpcBCpIBCAU" +
-        "QABqHATCBhAKBgQCTJMKIfmfeZpaI7Q9rnsc29gdWawK7TnpVKRHws1iY7EUlYROeVcMdAwEqVM6f8BVCKLGgzQ7Gar_uuxfUGKwqEQzopp" +
-        "Draw4F75J464-7D5f6_oJQuGIBHZxqbMONtLjBCXRUhQW5szBLmTQ_R3qaJb5vf-h0APZfkYhq1cTttSCZkQYQBAqWAQqRAQgLEAAahgEwg" +
-        "YMCgYBvvGVH_M2H8qxxv94yaDYUTWbRnJ1uiIYc59KIQlfFimMPhSS7x2tqUa2-hI55JiII0Xym6GNkwLhyc1xtWChpVuIdSnbvttbrt4we" +
-        "DMLHqTwNOF6qAsVKGKT1Yh8yf-qb-DSmicgvFc74mBQm_6gAY1iQsf33YX8578ClhKBWHSCVkQYQAAqXAQqSAQgMEAAahwEwgYQCgYEAkuz" +
-        "Fcd5TJu7lYWYe2hQLFfUWIIj91BvQQLa_Thln4YtGCO8gG1KJqJm-YlmJOWQG0B7H_5RVhxUxV9KpmFnsDVkzUFKOsCBaYGXc12xPVioawU" +
-        "lAwp5qp3QQtZyx_se97YIoLzuLr46UkLcLnkIrp-Jo46QzYi_QHq45WTm8MQ0glpEGEAIKlwEKkgEIDRAAGocBMIGEAoGBAIUzbxOknXf_r" +
-        "Nt17_ir8JlWvrtnCWsQd1MAnl5mgArvavDtKeBYHzi5_Ak7DHlLzuA6YE8W175FxLFKpN2hkz-l-M7ltUSd8N1BvJRhK4t6WffWfC_1wPyo" +
-        "AbeSN2Yb1jygtZJQ8wGoXHcJQUXiMit3eFNyylwsJFj1gzAR4JCdIJeRBhABCpYBCpEBCA4QABqGATCBgwKBgFMcbEpl9ukVR6AO_R6sMyi" +
-        "U11I8b8MBSUCEC15iKsrVO8v_m47_TRRjWPYtQ9eZ7o1ocNJHaGUU7qqInFqtFaVnIceP6NmCsXhjs3MLrWPS8IRAy4Zf4FKmGOx3N9O2ve" +
-        "mjUygZ9vUiSkULdVrecinRaT8JQ5RG4bUMY04XGIwFIJiRBhADCpYBCpEBCA8QABqGATCBgwKBgGpCkW-NR3li8GlRvqpq2YZGSIgm_PTyD" +
-        "I2Zwfw69grsBmPpVFW48Vw7xoMN35zcrojEpialB_uQzlpLYOvsMl634CRIuj-n1QE3-gaZTTTE8mg-AR4mcxnTKThPnRQpbuOlYAnriwia" +
-        "sWiQEMbGjq_HmWioYYxFo9USlklQn4-9IJmRBhAEEpUBCpIBCAYQABqHATCBhAKBgQCoZkFGm9oLTqjeXZAq6j5S6i7K20V0lNdBBLqfmFB" +
-        "IRuTkYxhs4vUYnWjZrKRAd5bp6_py0csmFmpl_5Yh0b-2pdo_E5PNP7LGRzKyKSiFddyykKKzVOazH8YYldDAfE8Z5HoS9e48an5JsPg0jr" +
-        "-TPu34DnJq3yv2a6dqiKL9zSCakQYSlQEKkgEIEBAAGocBMIGEAoGBALhrihbf3EpjDQS2sCQHazoFgN0nBbE9eesnnFTfzQELXb2gnJU9e" +
-        "nmV_aDqaHKjgtLIPpCgn40lHrn5k6mvH5OdedyI6cCzE-N-GFp3nAq0NDJyMe0fhtIRD__CbT0ulcvkeow65ubXWfw6dBC2gR_34rdMe_L_" +
-        "TGRLMWjDULbNIJqRBg";
-
-    private Unittest() {
-    }
-
-    public static String getTvmknifePublicKeys() {
-        return tvmknifePublicKeys;
-    }
-
-    @Nonnull
-    public static CheckedServiceTicket createServiceTicket(@Nonnull TicketStatus status, int src) {
-        return createServiceTicket(status, src, 0);
-    }
-    @Nonnull
-    public static CheckedServiceTicket createServiceTicket(@Nonnull TicketStatus status,
-                                                           int src,
-                                                           long issuerUid) {
-        return createServiceTicketNative(status.ordinal(), src, issuerUid);
-    }
-
-    @Nonnull
-    public static CheckedUserTicket createUserTicket(@Nonnull TicketStatus status,
-                                                     long defaultUid,
-                                                     @Nonnull String[] scopes,
-                                                     @Nonnull long[] uids) {
-        return createUserTicket(status, defaultUid, scopes, uids, BlackboxEnv.TEST);
-    }
-
-    @Nonnull
-    public static CheckedUserTicket createUserTicket(@Nonnull TicketStatus status,
-                                                     long defaultUid,
-                                                     @Nonnull String[] scopes,
-                                                     @Nonnull long[] uids,
-                                                     BlackboxEnv env) {
-        StringBuilder b = new StringBuilder();
-        if (scopes != null) {
-            for (String v : scopes) {
-                b.append(v).append(";");
-            }
-        }
-        StringBuilder b2 = new StringBuilder();
-        if (uids != null) {
-            for (long v : uids) {
-                b2.append(v).append(";");
-            }
-        }
-
-        return createUserTicketNative(status.ordinal(), defaultUid, b.toString(), b2.toString(), env.ordinal());
-    }
-
-    private static native CheckedServiceTicket createServiceTicketNative(int status, int src, long issuerUid);
-    private static native CheckedUserTicket createUserTicketNative(int status,
-                                                                   long defaultUid,
-                                                                   String scopes,
-                                                                   String uids,
-                                                                   int env);
-
-    static {
-        JniUtils.loadLibrary();
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/Utils.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/Utils.java
deleted file mode 100644
index 340d3396185..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/Utils.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import javax.annotation.Nonnull;
-
-import ru.yandex.passport.tvmauth.internal.JniUtils;
-
-public class Utils {
-    private Utils() {
-    }
-
-    /**
-     * Remove signature from ticket string - rest part can be parsed later with `tvmknife parse_ticket ...`
-     * @return safe for logging part of ticket
-     */
-    @Nonnull
-    public static native String removeTicketSignature(@Nonnull String ticketBody);
-
-    static {
-        JniUtils.loadLibrary();
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/Version.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/Version.java
deleted file mode 100644
index 076fa5032f1..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/Version.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import javax.annotation.Nonnull;
-
-import ru.yandex.passport.tvmauth.internal.JniUtils;
-
-public final class Version {
-    private Version() {
-    }
-
-    @Nonnull
-    public static native String get();
-
-    static {
-        JniUtils.loadLibrary();
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/deprecated/ServiceContext.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/deprecated/ServiceContext.java
deleted file mode 100644
index 63af7bbeac0..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/deprecated/ServiceContext.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package ru.yandex.passport.tvmauth.deprecated;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import ru.yandex.passport.tvmauth.CheckedServiceTicket;
-import ru.yandex.passport.tvmauth.internal.JniUtils;
-import ru.yandex.passport.tvmauth.internal.NativeHandle;
-
-/**
- * WARNING: it is low level API: first of all try use NativeTvmClient.
- */
-public final class ServiceContext extends NativeHandle {
-    /**
-     * Create service context.
-     * Service contexts are used to store TVM keys and parse service tickets.
-     * Service contexts are used to make signature for TVM-API.
-     * @param tvmId
-     * @param secretBase64
-     */
-    public ServiceContext(int tvmId, @Nullable String secretBase64, @Nullable String tvmKeysResponse) {
-        if (tvmKeysResponse == null && secretBase64 == null) {
-            throw new IllegalArgumentException("secretBase64 and tvmKeysResponse cannot be both null-reference");
-        }
-        this.nativeHandle = factory(tvmId, secretBase64, tvmKeysResponse);
-    }
-
-    /**
-     * Create service context.
-     * Service contexts are used to make signature for TVM-API.
-     */
-    public ServiceContext(@Nonnull String secretBase64, int tvmId) {
-        this(tvmId, secretBase64, null);
-    }
-
-    /**
-     * Create service context.
-     * Service contexts are used to store TVM keys and parse service tickets.
-     */
-    public ServiceContext(int tvmId, @Nonnull String tvmKeysResponse) {
-        this(tvmId, null, tvmKeysResponse);
-    }
-
-    @Nonnull
-    public static ServiceContext create(int tvmId, @Nullable String secretBase64, @Nullable String tvmKeysResponse) {
-        return new ServiceContext(tvmId, secretBase64, tvmKeysResponse);
-    }
-    @Nonnull
-    public static ServiceContext create(@Nonnull String secretBase64, int tvmId) {
-        return new ServiceContext(secretBase64, tvmId);
-    }
-    @Nonnull
-    public static ServiceContext create(int tvmId, @Nonnull String tvmKeysResponse) {
-        return new ServiceContext(tvmId, tvmKeysResponse);
-    }
-
-    /**
-     * Parse and validate service ticket body then create CheckedServiceTicket object.
-     */
-    @Nonnull
-    public CheckedServiceTicket check(@Nonnull String ticketBody) {
-        rwlock.readLock().lock();
-        try {
-            return checkNative(getNativeHandle(), ticketBody);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-
-    /**
-     * Sign params for TVM API
-     */
-    @Nonnull
-    public String signCgiParamsForTvm(@Nonnull String ts, @Nonnull String dst, @Nonnull String scopes) {
-        rwlock.readLock().lock();
-        try {
-            return signCgiParamsForTvmNative(getNativeHandle(), ts, dst, scopes);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-    public String signCgiParamsForTvm(String ts, String dst) {
-        return signCgiParamsForTvm(ts, dst, "");
-    }
-
-    @Override
-    protected void disposeHandle(long handle) {
-        dispose(handle);
-    }
-
-    private static native long factory(int tvmId, String secretBase64, String tvmKeysResponse);
-    private static native void dispose(long nativeHandle);
-    private static native CheckedServiceTicket checkNative(long nativeHandle, String ticketBody);
-    private static native String signCgiParamsForTvmNative(long nativeHandle, String ts, String dst, String scopes);
-
-    static {
-        JniUtils.loadLibrary();
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/deprecated/UserContext.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/deprecated/UserContext.java
deleted file mode 100644
index d50dedac014..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/deprecated/UserContext.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package ru.yandex.passport.tvmauth.deprecated;
-
-import javax.annotation.Nonnull;
-
-import ru.yandex.passport.tvmauth.BlackboxEnv;
-import ru.yandex.passport.tvmauth.CheckedUserTicket;
-import ru.yandex.passport.tvmauth.internal.JniUtils;
-import ru.yandex.passport.tvmauth.internal.NativeHandle;
-
-/**
- * WARNING: it is low level API: first of all try use NativeTvmClient.
- */
-public final class UserContext extends NativeHandle {
-    /**
-     * Create user context.
-     */
-    public UserContext(@Nonnull BlackboxEnv env, @Nonnull String tvmKeysResponse) {
-        this.nativeHandle = factory(env.ordinal(), tvmKeysResponse);
-    }
-    @Nonnull
-    public static UserContext create(@Nonnull BlackboxEnv env, @Nonnull String tvmKeysResponse) {
-        return new UserContext(env, tvmKeysResponse);
-    }
-
-    /**
-     * Parse and validate user ticket body then create CheckedUserTicket object.
-     */
-    @Nonnull
-    public CheckedUserTicket check(@Nonnull String ticketBody) {
-        rwlock.readLock().lock();
-        try {
-            return checkNative(getNativeHandle(), ticketBody);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-
-    @Override
-    protected void disposeHandle(long handle) {
-        dispose(handle);
-    }
-
-    private static native long factory(int env, String tvmKeysResponse);
-    private static native void dispose(long nativeHandle);
-    private static native CheckedUserTicket checkNative(long nativeHandle, String ticketBody);
-
-    static {
-        JniUtils.loadLibrary();
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/BrokenTvmClientSettings.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/BrokenTvmClientSettings.java
deleted file mode 100644
index 0d660018592..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/BrokenTvmClientSettings.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yandex.passport.tvmauth.exception;
-
-public class BrokenTvmClientSettings extends NonRetriableException {
-    public BrokenTvmClientSettings(String message) {
-        super(message);
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/ClientException.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/ClientException.java
deleted file mode 100644
index c784ff90398..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/ClientException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yandex.passport.tvmauth.exception;
-
-public class ClientException extends TvmException {
-    public ClientException(String message) {
-        super(message);
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/ContextException.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/ContextException.java
deleted file mode 100644
index d1fa1581dc1..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/ContextException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yandex.passport.tvmauth.exception;
-
-public class ContextException extends TvmException {
-    public ContextException(String message) {
-        super(message);
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/EmptyTvmKeysException.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/EmptyTvmKeysException.java
deleted file mode 100644
index 8d11e73b888..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/EmptyTvmKeysException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yandex.passport.tvmauth.exception;
-
-public class EmptyTvmKeysException extends ContextException {
-    public EmptyTvmKeysException(String message) {
-        super(message);
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/MalformedTvmKeysException.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/MalformedTvmKeysException.java
deleted file mode 100644
index d714339c4cb..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/MalformedTvmKeysException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yandex.passport.tvmauth.exception;
-
-public class MalformedTvmKeysException extends ContextException {
-    public MalformedTvmKeysException(String message) {
-        super(message);
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/MalformedTvmSecretException.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/MalformedTvmSecretException.java
deleted file mode 100644
index c623705348e..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/MalformedTvmSecretException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yandex.passport.tvmauth.exception;
-
-public class MalformedTvmSecretException extends ContextException {
-    public MalformedTvmSecretException(String message) {
-        super(message);
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/MissingServiceTicket.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/MissingServiceTicket.java
deleted file mode 100644
index d2281483b02..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/MissingServiceTicket.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yandex.passport.tvmauth.exception;
-
-public class MissingServiceTicket extends NonRetriableException {
-    public MissingServiceTicket(String message) {
-        super(message);
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/NonRetriableException.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/NonRetriableException.java
deleted file mode 100644
index b008de86268..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/NonRetriableException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yandex.passport.tvmauth.exception;
-
-public class NonRetriableException extends ClientException {
-    public NonRetriableException(String message) {
-        super(message);
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/NotAllowedException.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/NotAllowedException.java
deleted file mode 100644
index a032c13c929..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/NotAllowedException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yandex.passport.tvmauth.exception;
-
-public class NotAllowedException extends TvmException {
-    public NotAllowedException(String message) {
-        super(message);
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/PermissionDenied.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/PermissionDenied.java
deleted file mode 100644
index b04340d103d..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/PermissionDenied.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yandex.passport.tvmauth.exception;
-
-public class PermissionDenied extends NonRetriableException {
-    public PermissionDenied(String message) {
-        super(message);
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/RetriableException.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/RetriableException.java
deleted file mode 100644
index ff94b5927c8..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/RetriableException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yandex.passport.tvmauth.exception;
-
-public class RetriableException extends ClientException {
-    public RetriableException(String message) {
-        super(message);
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/TvmException.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/TvmException.java
deleted file mode 100644
index 5a84ce3396d..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/exception/TvmException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yandex.passport.tvmauth.exception;
-
-public class TvmException extends RuntimeException {
-    public TvmException(String message) {
-        super(message);
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/internal/JniUtils.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/internal/JniUtils.java
deleted file mode 100644
index bd5b7f13f8d..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/internal/JniUtils.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * Some similar logic already exists in Arcadia:
- *   https://a.yandex-team.ru/arc/trunk/arcadia/iceberg/misc/src/main/java/ru/yandex/misc/jni/JniUtils.java
- * or in github:
- *   https://github.com/adamheinrich/native-utils/blob/master/src/main/java/cz/adamh/utils/NativeUtils.java
- *
- * This class doesn't use side utils and contains all logic inside
- *   to provide hermetic jar for exporting out from Arcadia.
- */
-
-package ru.yandex.passport.tvmauth.internal;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class JniUtils {
-    private static final Logger logger = LoggerFactory.getLogger(JniUtils.class);
-    private static boolean wasCalled = false;
-
-    private JniUtils() {
-    }
-
-    /**
-     * Loads library from .jar by default.
-     * NOTE: this method will be called implicitly
-     */
-    public static synchronized void loadLibrary() {
-        if (wasCalled) {
-            return;
-        }
-
-        try {
-            tryLoadFromJar();
-            wasCalled = true;
-        } catch (RuntimeException e) {
-            logger.error("Failed to load native library from jar: {}", e);
-            throw e;
-        } catch (IOException e) {
-            logger.error("Failed to load native library from jar: {}", e);
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * Loads library from java.library.path
-     *
-     * WARNING! If you use this method directly, you make the commitment:
-     *   it is your responsibility to keep .jar and native library (.so/.dll/.dylib)
-     *   in the same revision!
-     */
-    public static synchronized void loadLibraryFromLibraryPath() {
-        loadInLegacyWay();
-        wasCalled = true;
-    }
-
-    private static void loadInLegacyWay() {
-        System.loadLibrary("tvmauth_java");
-    }
-
-    private static void tryLoadFromJar() throws IOException {
-        // Run with arm64 from maven
-        if ("aarch64".equals(System.getProperty("os.arch"))) {
-            if (tryLoadResource("tvmauth_java_arm64")) {
-                return;
-            }
-        }
-
-        // Any run from Arcadia build or run on x86_64 from maven
-        String libname = "tvmauth_java";
-        if (tryLoadResource(libname)) {
-            return;
-        }
-
-        throw new FileNotFoundException("File " + libname + " was not found inside JAR.");
-    }
-
-    private static boolean tryLoadResource(String libname) throws IOException {
-        try (InputStream is = getResourceStream(libname)) {
-            if (is == null) {
-                return false;
-            }
-
-            String tempDir = System.getProperty("java.io.tmpdir");
-            Path tempFile = Files.createTempFile(Paths.get(tempDir), "tvmauth_java_", ".tmp");
-
-            try {
-                Files.copy(is, tempFile, StandardCopyOption.REPLACE_EXISTING);
-                System.load(tempFile.toString());
-            } finally {
-                if (System.getProperty("os.name").toLowerCase().contains("windows")) {
-                    File f = new File(tempFile.toString());
-                    f.deleteOnExit();
-                } else {
-                    Files.delete(tempFile);
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private static InputStream getResourceStream(String name) {
-        return JniUtils.class.getResourceAsStream("/" + System.mapLibraryName(name));
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/internal/LogFetcher.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/internal/LogFetcher.java
deleted file mode 100644
index 675d6c106af..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/internal/LogFetcher.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package ru.yandex.passport.tvmauth.internal;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import ru.yandex.passport.tvmauth.TvmClient;
-
-public class LogFetcher extends NativeHandle {
-    class Message {
-        int lvl;
-        String msg;
-    }
-
-    private Logger logger;
-
-    public LogFetcher() {
-        this.logger = LoggerFactory.getLogger(TvmClient.class);
-        this.nativeHandle = factory();
-    }
-
-    public void run() {
-        rwlock.readLock().lock();
-
-        if (nativeHandle == 0) {
-            return;
-        }
-
-        Message[] msgs = null;
-        try {
-            msgs = fetch(getNativeHandle());
-            if (msgs == null) {
-                return;
-            }
-
-            for (Message m : msgs) {
-                log(m.lvl, m.msg);
-            }
-        } catch (Exception e) {
-            logger.error("Got error on processing log messages: {}", e);
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-
-    public long getHandle() {
-        rwlock.readLock().lock();
-        try {
-            return getNativeHandle();
-        } finally {
-            rwlock.readLock().unlock();
-        }
-    }
-
-    @Override
-    protected void disposeHandle(long handle) {
-        dispose(handle);
-    }
-
-    private void log(int lvl, String msg) {
-        switch (lvl) {
-        case 0:
-        case 1:
-        case 2:
-        case 3:
-            logger.error("{}", msg);
-            break;
-        case 4:
-        case 5:
-            logger.warn("{}", msg);
-            break;
-        case 6:
-            logger.info("{}", msg);
-            break;
-        case 7:
-            logger.debug("{}", msg);
-            break;
-        default: break;
-        }
-    }
-
-    private static native long factory();
-    private static native void dispose(long nativeHandle);
-    private static native Message[] fetch(long nativeHandle);
-
-    static {
-        JniUtils.loadLibrary();
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/internal/NativeHandle.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/internal/NativeHandle.java
deleted file mode 100644
index 685dc2673cd..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/internal/NativeHandle.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package ru.yandex.passport.tvmauth.internal;
-
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-public abstract class NativeHandle implements AutoCloseable {
-    protected final ReentrantReadWriteLock rwlock = new ReentrantReadWriteLock();
-    protected long nativeHandle;
-
-    @Override
-    public void close() {
-        rwlock.writeLock().lock();
-        try {
-            disposeHandle(nativeHandle);
-            this.nativeHandle = 0;
-        } finally {
-            rwlock.writeLock().unlock();
-        }
-    }
-
-    protected abstract void disposeHandle(long handle);
-
-    protected long getNativeHandle() {
-        if (nativeHandle == 0) {
-            throw new IllegalStateException("Instance is already destroyed");
-        }
-        return nativeHandle;
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    protected void finalize() {
-        this.close();
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/roles/ConsumerRoles.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/roles/ConsumerRoles.java
deleted file mode 100644
index 906dc4497a1..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/roles/ConsumerRoles.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package ru.yandex.passport.tvmauth.roles;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-public class ConsumerRoles {
-    private Map<String, ArrayList<HashMap<String, String>>> roles;
-
-    ConsumerRoles(@Nonnull Map<String, ArrayList<HashMap<String, String>>> roles) {
-        this.roles = roles;
-    }
-
-    @Nonnull
-    public String debugPrint() {
-        Gson gson = new GsonBuilder().setPrettyPrinting().create();
-
-        return gson.toJson(this.roles);
-    }
-
-    public boolean hasRole(@Nonnull String rolename) {
-        return this.roles.containsKey(rolename);
-    }
-
-    public ArrayList<HashMap<String, String>> getEntitiesForRole(@Nonnull String rolename) {
-        return this.roles.get(rolename);
-    }
-
-    // TODO: PASSP-38421
-    // public boolean checkRoleForExactEntity(@Nonnull String rolename, @Nonnull Map<String, String>[] exactEntity) {
-    // }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/roles/Meta.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/roles/Meta.java
deleted file mode 100644
index 98cb6fad1db..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/roles/Meta.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package ru.yandex.passport.tvmauth.roles;
-
-import java.util.Date;
-
-import javax.annotation.Nonnull;
-
-public class Meta {
-    private String revision;
-    private Date bornTime;
-    private Date appliedTime;
-
-    public Meta(@Nonnull String revision, @Nonnull Date bornTime, @Nonnull Date appliedTime) {
-        this.revision = revision;
-        this.bornTime = bornTime;
-        this.appliedTime = appliedTime;
-    }
-
-    @Nonnull
-    public String getRevision() {
-        return this.revision;
-    }
-
-    @Nonnull
-    public Date getBornTime() {
-        return this.bornTime;
-    }
-
-    @Nonnull
-    public Date getAppliedTime() {
-        return this.appliedTime;
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/roles/Roles.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/roles/Roles.java
deleted file mode 100644
index 9c3cbc72839..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/roles/Roles.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package ru.yandex.passport.tvmauth.roles;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import ru.yandex.passport.tvmauth.BlackboxEnv;
-import ru.yandex.passport.tvmauth.CheckedServiceTicket;
-import ru.yandex.passport.tvmauth.CheckedUserTicket;
-import ru.yandex.passport.tvmauth.exception.NotAllowedException;
-
-public class Roles {
-    private Meta meta;
-    private Map<Integer, ConsumerRoles> tvm;
-    private Map<Long, ConsumerRoles> user;
-    private String raw;
-
-    public Roles(
-        @Nonnull Meta meta,
-        @Nonnull Map<Integer, ConsumerRoles> tvm,
-        @Nonnull Map<Long, ConsumerRoles> user,
-        @Nonnull String raw) {
-        this.meta = meta;
-        this.tvm = tvm;
-        this.user = user;
-        this.raw = raw;
-    }
-
-    @Nonnull
-    public Meta getMeta() {
-        return this.meta;
-    }
-
-    @Nonnull
-    public String getRaw() {
-        return this.raw;
-    }
-
-    public ConsumerRoles getRolesForService(@Nonnull CheckedServiceTicket checked) {
-        if (!checked.booleanValue()) {
-            throw new NotAllowedException("ServiceTicket is not valid");
-        }
-
-        return this.tvm.get(checked.getSrc());
-    }
-
-    public ConsumerRoles getRolesForUser(@Nonnull CheckedUserTicket checked) {
-        commonUserChecks(checked);
-
-        return this.user.get(checked.getDefaultUid());
-    }
-
-    public ConsumerRoles getRolesForUser(@Nonnull CheckedUserTicket checked, long selectedUid) {
-        commonUserChecks(checked);
-        if (!Arrays.stream(checked.getUids()).anyMatch(x -> x == selectedUid)) {
-            throw new NotAllowedException("selectedUid must be in user ticket but it's not: " + selectedUid);
-        }
-
-        return this.user.get(selectedUid);
-    }
-
-    private void commonUserChecks(@Nonnull CheckedUserTicket checked) {
-        if (!checked.booleanValue()) {
-            throw new NotAllowedException("UserTicket is not valid");
-        }
-        if (checked.getEnv() != BlackboxEnv.PROD_YATEAM) {
-            throw new NotAllowedException("User ticket must be from ProdYateam, got from " + checked.getEnv());
-        }
-    }
-
-    // some shortcuts
-
-    public boolean checkServiceRole(@Nonnull CheckedServiceTicket checked, @Nonnull String role) {
-        ConsumerRoles c = getRolesForService(checked);
-        if (c == null) {
-            return false;
-        }
-
-        return c.hasRole(role);
-    }
-
-    public boolean checkUserRole(@Nonnull CheckedUserTicket checked, @Nonnull String role) {
-        ConsumerRoles c = getRolesForUser(checked);
-        if (c == null) {
-            return false;
-        }
-
-        return c.hasRole(role);
-    }
-
-    public boolean checkUserRole(@Nonnull CheckedUserTicket checked, @Nonnull String role, long selectedUid) {
-        ConsumerRoles c = getRolesForUser(checked, selectedUid);
-        if (c == null) {
-            return false;
-        }
-
-        return c.hasRole(role);
-    }
-}
diff --git a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/roles/RolesParser.java b/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/roles/RolesParser.java
deleted file mode 100644
index e0d92c28126..00000000000
--- a/library/java/tvmauth/src/main/java/ru/yandex/passport/tvmauth/roles/RolesParser.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package ru.yandex.passport.tvmauth.roles;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class RolesParser {
-    private RolesParser() {
-    }
-
-    public static Roles parse(@Nonnull String raw) {
-        JsonObject root = new JsonParser().parse(raw).getAsJsonObject();
-
-        return new Roles(
-            getMeta(root),
-            getConsumers(root, "tvm", Integer.class),
-            getConsumers(root, "user", Long.class),
-            raw
-        );
-    }
-
-    @Nonnull
-    private static Meta getMeta(@Nonnull JsonObject root) {
-        String revision = root.get("revision").getAsString();
-
-        return new Meta(
-            root.get("revision").getAsString(),
-            new Date(root.get("born_date").getAsNumber().longValue() * 1000),
-            new Date()
-        );
-    }
-
-    private static <T> Map<T, ConsumerRoles> getConsumers(
-        @Nonnull JsonObject node,
-        @Nonnull String key,
-        Class<T> type) {
-        Map<T, ConsumerRoles> res = new HashMap<T, ConsumerRoles>();
-        if (!node.has(key)) {
-            return res;
-        }
-
-        JsonObject obj = node.getAsJsonObject(key);
-
-        for (String id : obj.keySet()) {
-            res.put(
-                parseNum(id, type),
-                getConsumerRoles(obj.getAsJsonObject(id))
-            );
-        }
-
-        return res;
-    }
-
-    private static <T> T parseNum(String id, Class<T> type) {
-        if (type == Integer.class) {
-            return (T) Integer.valueOf(id);
-        }
-        return (T) Long.valueOf(id);
-    }
-
-    private static ConsumerRoles getConsumerRoles(@Nonnull JsonObject obj) {
-        Map<String, ArrayList<HashMap<String, String>>> roles =
-            new HashMap<String, ArrayList<HashMap<String, String>>>();
-
-        for (String id : obj.keySet()) {
-            roles.put(
-                id,
-                getEntities(obj.getAsJsonArray(id))
-            );
-        }
-
-        return new ConsumerRoles(roles);
-    }
-
-    private static ArrayList<HashMap<String, String>> getEntities(@Nonnull JsonArray arr) {
-        ArrayList<HashMap<String, String>> entities = new ArrayList<HashMap<String, String>>();
-
-        for (int i = 0; i < arr.size(); i++) {
-            entities.add(getEntity(arr.get(i).getAsJsonObject()));
-        }
-
-        return entities;
-    }
-
-    private static HashMap<String, String> getEntity(@Nonnull JsonObject obj) {
-        HashMap<String, String> entity = new HashMap<String, String>();
-
-        for (String key : obj.keySet()) {
-            entity.put(
-                key,
-                obj.get(key).getAsString()
-            );
-        }
-
-        return entity;
-    }
-}
diff --git a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/BlackboxTvmIdTest.java b/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/BlackboxTvmIdTest.java
deleted file mode 100644
index feeef52e936..00000000000
--- a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/BlackboxTvmIdTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class BlackboxTvmIdTest {
-    @Test
-    public void blackboxTvmIdTest() {
-        Assert.assertEquals("222", BlackboxTvmId.PROD.toString());
-        Assert.assertEquals("224", BlackboxTvmId.TEST.toString());
-        Assert.assertEquals("223", BlackboxTvmId.PROD_YATEAM.toString());
-        Assert.assertEquals("225", BlackboxTvmId.TEST_YATEAM.toString());
-        Assert.assertEquals("226", BlackboxTvmId.STRESS.toString());
-        Assert.assertEquals("239", BlackboxTvmId.MIMINO.toString());
-    }
-}
diff --git a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/ClientRolesTest.java b/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/ClientRolesTest.java
deleted file mode 100644
index ee3a834a252..00000000000
--- a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/ClientRolesTest.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import ru.yandex.passport.tvmauth.roles.ConsumerRoles;
-import ru.yandex.passport.tvmauth.roles.Roles;
-
-public class ClientRolesTest {
-    static String readAuthToken() throws IOException {
-        return new String(Files.readAllBytes(Paths.get("./tvmtool.authtoken")), StandardCharsets.UTF_8);
-    }
-
-    static int readPort(String port) throws IOException {
-        return Integer.parseInt(
-            new String(Files.readAllBytes(Paths.get(port)), StandardCharsets.UTF_8)
-        );
-    }
-
-    static NativeTvmClient createClientWithTirole(boolean checkSrc, boolean checkDefaultUid) throws IOException {
-        TvmApiSettings s = new TvmApiSettings();
-        s.setSelfTvmId(1000502);
-        s.enableServiceTicketsFetchOptions("e5kL0vM3nP-nPf-388Hi6Q", new int[]{});
-        s.fetchRolesForIdmSystemSlug("some_slug_2");
-        s.setDiskCacheDir("./");
-        s.enableServiceTicketChecking();
-        s.enableUserTicketChecking(BlackboxEnv.PROD_YATEAM);
-        s.setTvmPortForLocalhost(readPort("./tvmapi.port"));
-        s.setTiroleConnectionParams("http://localhost", readPort("./tirole.port"), 1000001);
-
-        s.shouldCheckSrc(checkSrc);
-        s.shouldCheckDefaultUid(checkDefaultUid);
-
-        return new NativeTvmClient(s);
-    }
-
-    static NativeTvmClient createClientWithTvmtool(boolean checkSrc, boolean checkDefaultUid) throws IOException {
-        TvmToolSettings s = TvmToolSettings.create("me");
-        s.setPort(readPort("./tvmtool.port"));
-        s.setAuthToken(readAuthToken());
-
-        s.shouldCheckSrc(checkSrc);
-        s.shouldCheckDefaultUid(checkDefaultUid);
-
-        return new NativeTvmClient(s);
-    }
-
-    static void checkServiceNoRoles(TvmClient clientWithAutoCheck, TvmClient clientWithoutAutoCheck) {
-        // src=1000000000: tvmknife unittest service -s 1000000000 -d 1000502
-        String stWithoutRoles = "3:serv:CBAQ__________9_IgoIgJTr3AMQtog9:" +
-            "Sv3SKuDQ4p-2419PKqc1vo9EC128K6Iv7LKck5SyliJZn5gTAqMDAwb9aYWH" +
-            "hf49HTR-Qmsjw4i_Lh-sNhge-JHWi5PTGFJm03CZHOCJG9Y0_G1pcgTfodtA" +
-            "svDykMxLhiXGB4N84cGhVVqn1pFWz6SPmMeKUPulTt7qH1ifVtQ";
-
-        CheckedServiceTicket checked = clientWithAutoCheck.checkServiceTicket(stWithoutRoles);
-        Assert.assertEquals(TicketStatus.NO_ROLES, checked.getStatus());
-
-        checked = clientWithoutAutoCheck.checkServiceTicket(stWithoutRoles);
-        Assert.assertEquals(TicketStatus.OK, checked.getStatus());
-        Assert.assertNull(clientWithoutAutoCheck.getRoles().getRolesForService(checked));
-    }
-
-    static void checkServiceHasRoles(TvmClient clientWithAutoCheck, TvmClient clientWithoutAutoCheck) {
-        // src=1000000001: tvmknife unittest service -s 1000000001 -d 1000502
-        String stWithRoles = "3:serv:CBAQ__________9_IgoIgZTr3AMQtog9:" +
-            "EyPympmoLBM6jyiQLcK8ummNmL5IUAdTvKM1do8ppuEgY6yHfto3s_WAK" +
-            "mP9Pf9EiNqPBe18HR7yKmVS7gvdFJY4gP4Ut51ejS-iBPlsbsApJOYTgo" +
-            "dQPhkmjHVKIT0ub0pT3fWHQtapb8uimKpGcO6jCfopFQSVG04Ehj7a0jw";
-
-        for (TvmClient cl : new TvmClient[]{clientWithAutoCheck, clientWithoutAutoCheck}) {
-            CheckedServiceTicket checked = cl.checkServiceTicket(stWithRoles);
-            Assert.assertEquals(TicketStatus.OK, checked.getStatus());
-
-            Roles clientRoles = cl.getRoles();
-            ConsumerRoles roles = clientRoles.getRolesForService(checked);
-            Assert.assertEquals(
-                "{\n" +
-                "  \"/role/service/read/\": [\n" +
-                "    {}\n" +
-                "  ],\n" +
-                "  \"/role/service/write/\": [\n" +
-                "    {\n" +
-                "      \"kek\": \"lol\",\n" +
-                "      \"foo\": \"bar\"\n" +
-                "    }\n" +
-                "  ]\n" +
-                "}",
-                roles.debugPrint()
-             );
-
-            Assert.assertTrue(clientRoles.checkServiceRole(
-                checked,
-                "/role/service/read/"
-            ));
-            Assert.assertTrue(clientRoles.checkServiceRole(
-                checked,
-                "/role/service/write/"
-            ));
-            Assert.assertFalse(clientRoles.checkServiceRole(
-                checked,
-                "/role/foo/"
-            ));
-        }
-    }
-
-    static void checkUserNoRoles(TvmClient clientWithAutoCheck, TvmClient clientWithoutAutoCheck) {
-        // default_uid=1000000000: tvmknife unittest user -d 1000000000 --env prod_yateam
-        String utWithoutRoles = "3:user:CAwQ__________9_GhYKBgiAlOvcAxCAlOvcAyDShdjMBCgC:" +
-                "LloRDlCZ4vd0IUTOj6MD1mxBPgGhS6EevnnWvHgyXmxc--2CVVkAtNKNZJqCJ6GtDY4nknEn" +
-                "YmWvEu6-MInibD-Uk6saI1DN-2Y3C1Wdsz2SJCq2OYgaqQsrM5PagdyP9PLrftkuV_ZluS_F" +
-                "UYebMXPzjJb0L0ALKByMPkCVWuk";
-
-        CheckedUserTicket checked = clientWithAutoCheck.checkUserTicket(utWithoutRoles);
-        Assert.assertEquals(TicketStatus.NO_ROLES, checked.getStatus());
-
-        checked = clientWithoutAutoCheck.checkUserTicket(utWithoutRoles);
-        Assert.assertEquals(TicketStatus.OK, checked.getStatus());
-        Assert.assertNull(clientWithoutAutoCheck.getRoles().getRolesForUser(checked));
-    }
-
-    static void checkUserHasRoles(TvmClient clientWithAutoCheck, TvmClient clientWithoutAutoCheck) {
-        //  default_uid=1120000000000001: tvmknife unittest user -d 1120000000000001 --env prod_yateam
-        String utWithRoles = "3:user:CAwQ__________9_GhwKCQiBgJiRpdT-ARCBgJiRpdT-ASDShdjMBCgC:" +
-            "SQV7Z9hDpZ_F62XGkSF6yr8PoZHezRp0ZxCINf_iAbT2rlEiO6j4UfLjzwn3EnRXkAOJxuAtTDCnHlrzd" +
-            "h3JgSKK7gciwPstdRT5GGTixBoUU9kI_UlxEbfGBX1DfuDsw_GFQ2eCLu4Svq6jC3ynuqQ41D2RKopYL8Bx8PDZKQc";
-
-        for (TvmClient cl : new TvmClient[]{clientWithAutoCheck, clientWithoutAutoCheck}) {
-            CheckedUserTicket checked = cl.checkUserTicket(utWithRoles);
-            Assert.assertEquals(TicketStatus.OK, checked.getStatus());
-
-            Roles clientRoles = cl.getRoles();
-            ConsumerRoles roles = clientRoles.getRolesForUser(checked);
-            Assert.assertEquals(
-                "{\n" +
-                "  \"/role/user/write/\": [\n" +
-                "    {}\n" +
-                "  ],\n" +
-                "  \"/role/user/read/\": [\n" +
-                "    {\n" +
-                "      \"kek\": \"lol\",\n" +
-                "      \"foo\": \"bar\"\n" +
-                "    }\n" +
-                "  ]\n" +
-                "}",
-                roles.debugPrint()
-            );
-
-            Assert.assertTrue(clientRoles.checkUserRole(
-                checked,
-                "/role/user/read/"
-            ));
-            Assert.assertTrue(clientRoles.checkUserRole(
-                checked,
-                "/role/user/write/"
-            ));
-            Assert.assertFalse(clientRoles.checkUserRole(
-                checked,
-                "/role/foo/"
-            ));
-        }
-    }
-
-    @Test
-    public void rolesFromTiroleCheckSrcNoRoles() throws IOException {
-        NativeTvmClient clientWithAutoCheck = createClientWithTirole(true, true);
-        NativeTvmClient clientWithoutAutoCheck = createClientWithTirole(false, true);
-
-        checkServiceNoRoles(clientWithAutoCheck, clientWithoutAutoCheck);
-
-        clientWithAutoCheck.close();
-        clientWithoutAutoCheck.close();
-    }
-
-    @Test
-    public void rolesFromTiroleCheckSrcHasRoles() throws IOException {
-        NativeTvmClient clientWithAutoCheck = createClientWithTirole(true, true);
-        NativeTvmClient clientWithoutAutoCheck = createClientWithTirole(false, true);
-
-        checkServiceHasRoles(clientWithAutoCheck, clientWithoutAutoCheck);
-
-        clientWithAutoCheck.close();
-        clientWithoutAutoCheck.close();
-    }
-
-    @Test
-    public void rolesFromTiroleCheckDefaultUidNoRoles() throws IOException {
-        NativeTvmClient clientWithAutoCheck = createClientWithTirole(true, true);
-        NativeTvmClient clientWithoutAutoCheck = createClientWithTirole(true, false);
-
-        checkUserNoRoles(clientWithAutoCheck, clientWithoutAutoCheck);
-
-        clientWithAutoCheck.close();
-        clientWithoutAutoCheck.close();
-    }
-
-    @Test
-    public void rolesFromTiroleCheckDefaultUidHasRoles() throws IOException {
-        NativeTvmClient clientWithAutoCheck = createClientWithTirole(true, true);
-        NativeTvmClient clientWithoutAutoCheck = createClientWithTirole(true, false);
-
-        checkUserHasRoles(clientWithAutoCheck, clientWithoutAutoCheck);
-
-        clientWithAutoCheck.close();
-        clientWithoutAutoCheck.close();
-    }
-
-
-    @Test
-    public void rolesFromTvmtoolCheckSrcNoRoles() throws IOException {
-        NativeTvmClient clientWithAutoCheck = createClientWithTvmtool(true, true);
-        NativeTvmClient clientWithoutAutoCheck = createClientWithTvmtool(false, true);
-
-        checkServiceNoRoles(clientWithAutoCheck, clientWithoutAutoCheck);
-
-        clientWithAutoCheck.close();
-        clientWithoutAutoCheck.close();
-    }
-
-    @Test
-    public void rolesFromTvmtoolCheckSrcHasRoles() throws IOException {
-        NativeTvmClient clientWithAutoCheck = createClientWithTvmtool(true, true);
-        NativeTvmClient clientWithoutAutoCheck = createClientWithTvmtool(false, true);
-
-        checkServiceHasRoles(clientWithAutoCheck, clientWithoutAutoCheck);
-
-        clientWithAutoCheck.close();
-        clientWithoutAutoCheck.close();
-    }
-
-    @Test
-    public void rolesFromTvmtoolCheckDefaultUidNoRoles() throws IOException {
-        NativeTvmClient clientWithAutoCheck = createClientWithTvmtool(true, true);
-        NativeTvmClient clientWithoutAutoCheck = createClientWithTvmtool(true, false);
-
-        checkUserNoRoles(clientWithAutoCheck, clientWithoutAutoCheck);
-
-        clientWithAutoCheck.close();
-        clientWithoutAutoCheck.close();
-    }
-
-    @Test
-    public void rolesFromTvmtoolCheckDefaultUidHasRoles() throws IOException {
-        NativeTvmClient clientWithAutoCheck = createClientWithTvmtool(true, true);
-        NativeTvmClient clientWithoutAutoCheck = createClientWithTvmtool(true, false);
-
-        checkUserHasRoles(clientWithAutoCheck, clientWithoutAutoCheck);
-
-        clientWithAutoCheck.close();
-        clientWithoutAutoCheck.close();
-    }
-}
diff --git a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/ServiceTest.java b/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/ServiceTest.java
deleted file mode 100644
index cc4515fa610..00000000000
--- a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/ServiceTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package ru.yandex.passport.tvmauth.deprecated;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import ru.yandex.passport.tvmauth.CheckedServiceTicket;
-import ru.yandex.passport.tvmauth.TicketStatus;
-import ru.yandex.passport.tvmauth.Unittest;
-import ru.yandex.passport.tvmauth.Utils;
-import ru.yandex.passport.tvmauth.exception.EmptyTvmKeysException;
-import ru.yandex.passport.tvmauth.exception.MalformedTvmKeysException;
-import ru.yandex.passport.tvmauth.exception.MalformedTvmSecretException;
-import ru.yandex.passport.tvmauth.exception.NotAllowedException;
-
-public class ServiceTest {
-    static final String EMPTY_TVM_KEYS =
-        "1:CpgCCpMCCAEQABqIAjCCAQQCggEAcLEXeH67FQESFUn4_7wnX7wN0PUrBoUsm3QQ4W5vC-qz6sXaEjSwnTV8w1o-z6X9KPLlhzMQvuS38" +
-        "NCNfK4uvJ4Zvfp3YsXJ25-rYtbnrYJHNvHohD-kPCCw_yZpMp21JdWigzQGuV7CtrxUhF-NNrsnUaJrE5-OpEWNt4X6nCItKIYeVcSK6XJU" +
-        "bEWbrNCRbvkSc4ak2ymFeMuHYJVjxh4eQbk7_ZPzodP0WvF6eUYrYeb42imVEOR8ofVLQWE5DVnb1z_TqZm4i1XkS7jMwZuBxBRw8DGdYei" +
-        "0lT_sAf7KST2jC0590NySB3vsBgWEVs1OdUUWA6r-Dvx9dsOQtSCVkQYQAAqZAgqUAggCEAAaiQIwggEFAoIBAQDhEBM5-6YsPWfogKtblu" +
-        "JoCX1WV2KdzOaQ0-OlRbBzeCzw-eQKu12c8WakHBbeCMd1I1TU64SDkDorWjXGIa_2xT6N3zzNAE50roTbPCcmeQrps26woTYfYIuqDdoxY" +
-        "KZNr0lvNLLW47vBr7EKqo1S4KSj7aXK_XYeEvUgIgf3nVIcNrio7VTnFmGGVQCepaL1Hi1gN4yIXjVZ06PBPZ-DxSRu6xOGbFrfKMJeMPs7" +
-        "KOyE-26Q3xOXdTIa1X-zYIucTd_bxUCL4BVbwW2AvbbFsaG7ISmVdGu0XUTmhXs1KrEfUVLRJhE4Dx99hAZXm1_HlYMUeJcMQ_oHOhV94EN" +
-        "FIJaRBhACCpYBCpEBCAMQABqGATCBgwKBgF9t2YJGAJkRRFq6fWhi3m1TFW1UOE0f6ZrfYhHAkpqGlKlh0QVfeTNPpeJhi75xXzCe6oReRU" +
-        "m-0DbqDNhTShC7uGUv1INYnRBQWH6E-5Fc5XrbDFSuGQw2EYjNfHy_HefHJXxQKAqPvxBDKMKkHgV58WtM6rC8jRi9sdX_ig2NIJeRBhABC" +
-        "pYBCpEBCAQQABqGATCBgwKBgGB4d6eLGUBv-Q6EPLehC4S-yuE2HB-_rJ7WkeYwyp-xIPolPrd-PQme2utHB4ZgpXHIu_OFksDe_0bPgZni" +
-        "NRSVRbl7W49DgS5Ya3kMfrYB4DnF5Fta5tn1oV6EwxYD4JONpFTenOJALPGTPawxXEfon_peiHOSBuQMu3_Vn-l1IJiRBhADCpcBCpIBCAU" +
-        "QABqHATCBhAKBgQCTJMKIfmfeZpaI7Q9rnsc29gdWawK7TnpVKRHws1iY7EUlYROeVcMdAwEqVM6f8BVCKLGgzQ7Gar_uuxfUGKwqEQzopp" +
-        "Draw4F75J464-7D5f6_oJQuGIBHZxqbMONtLjBCXRUhQW5szBLmTQ_R3qaJb5vf-h0APZfkYhq1cTttSCZkQYQBAqWAQqRAQgLEAAahgEwg" +
-        "YMCgYBvvGVH_M2H8qxxv94yaDYUTWbRnJ1uiIYc59KIQlfFimMPhSS7x2tqUa2-hI55JiII0Xym6GNkwLhyc1xtWChpVuIdSnbvttbrt4we" +
-        "DMLHqTwNOF6qAsVKGKT1Yh8yf-qb-DSmicgvFc74mBQm_6gAY1iQsf33YX8578ClhKBWHSCVkQYQAAqXAQqSAQgMEAAahwEwgYQCgYEAkuz" +
-        "Fcd5TJu7lYWYe2hQLFfUWIIj91BvQQLa_Thln4YtGCO8gG1KJqJm-YlmJOWQG0B7H_5RVhxUxV9KpmFnsDVkzUFKOsCBaYGXc12xPVioawU" +
-        "lAwp5qp3QQtZyx_se97YIoLzuLr46UkLcLnkIrp-Jo46QzYi_QHq45WTm8MQ0glpEGEAIKlwEKkgEIDRAAGocBMIGEAoGBAIUzbxOknXf_r" +
-        "Nt17_ir8JlWvrtnCWsQd1MAnl5mgArvavDtKeBYHzi5_Ak7DHlLzuA6YE8W175FxLFKpN2hkz-l-M7ltUSd8N1BvJRhK4t6WffWfC_1wPyo" +
-        "AbeSN2Yb1jygtZJQ8wGoXHcJQUXiMit3eFNyylwsJFj1gzAR4JCdIJeRBhABCpYBCpEBCA4QABqGATCBgwKBgFMcbEpl9ukVR6AO_R6sMyi" +
-        "U11I8b8MBSUCEC15iKsrVO8v_m47_TRRjWPYtQ9eZ7o1ocNJHaGUU7qqInFqtFaVnIceP6NmCsXhjs3MLrWPS8IRAy4Zf4FKmGOx3N9O2ve" +
-        "mjUygZ9vUiSkULdVrecinRaT8JQ5RG4bUMY04XGIwFIJiRBhADCpYBCpEBCA8QABqGATCBgwKBgGpCkW-NR3li8GlRvqpq2YZGSIgm_PTyD" +
-        "I2Zwfw69grsBmPpVFW48Vw7xoMN35zcrojEpialB_uQzlpLYOvsMl634CRIuj-n1QE3-gaZTTTE8mg-AR4mcxnTKThPnRQpbuOlYAnriwia" +
-        "sWiQEMbGjq_HmWioYYxFo9USlklQn4-9IJmRBhAE";
-    static final String EXPIRED_SERVICE_TICKET =
-        "3:serv:CBAQACIZCOUBEBwaCGJiOnNlc3MxGghiYjpzZXNzMg:IwfMNJYEqStY_SixwqJnyHOMCPR7-3HHk4uylB2oVRkthtezq-OOA7Qiz" +
-        "Dvx7VABLs_iTlXuD1r5IjufNei_EiV145eaa3HIg4xCdJXCojMexf2UYJz8mF2b0YzFAy6_KWagU7xo13CyKAqzJuQf5MJcSUf0ecY9hVh3" +
-        "6cJ51aw";
-    static final String MALFORMED_TVM_KEYS =
-        "1:CpgCCpMCCAEQABqIAjCCAQQCggEAcLEXeH67FQESFUn4_7wnX7wN0PUrBoUsm3QQ4W5vC-qz6sXaEjSwnTV8w1o-z6X9KPLlhzMQvuS38";
-    static final String MALFORMED_TVM_SECRET = "adcvxcv./-+";
-    static final int NOT_OUR_ID = 27;
-    static final int OUR_ID = 28;
-    static final String SECRET = "GRMJrKnj4fOVnvOqe-WyD1";
-    static final String SERVICE_TICKET_PROTOBUF = "CBAQ__________9_IhkI5QEQHBoIYmI6c2VzczEaCGJiOnNlc3My";
-    static final int SRC_ID = 229;
-    static final String UNSUPPORTED_VERSION_SERVICE_TICKET =
-        "2:serv:CBAQ__________9_IhkI5QEQHBoIYmI6c2VzczEaCGJiOnNlc3My:WUPx1cTf05fjD1exB35T5j2DCHWH1YaLJon_a4rN-D7JfXH" +
-        "K1Ai4wM4uSfboHD9xmGQH7extqtlEk1tCTCGm5qbRVloJwWzCZBXo3zKX6i1oBYP_89WcjCNPVe1e8jwGdLsnu6PpxL5cn0xCksiStILH5U" +
-        "mDR6xfkJdnmMG94o8";
-    static final String VALID_SERVICE_TICKET_1 =
-        "3:serv:CBAQ__________9_IhkI5QEQHBoIYmI6c2VzczEaCGJiOnNlc3My:WUPx1cTf05fjD1exB35T5j2DCHWH1YaLJon_a4rN-D7JfXH" +
-        "K1Ai4wM4uSfboHD9xmGQH7extqtlEk1tCTCGm5qbRVloJwWzCZBXo3zKX6i1oBYP_89WcjCNPVe1e8jwGdLsnu6PpxL5cn0xCksiStILH5U" +
-        "mDR6xfkJdnmMG94o8";
-    static final String VALID_SERVICE_TICKET_3 =
-        "3:serv:CBAQ__________9_IgUI5QEQHA:Sd6tmA1CNy2Nf7XevC3x7zr2DrGNRmcl-TxUsDtDW2xI3YXyCxBltWeg0-KtDlqyYuPOP5Jd_" +
-        "-XXNA12KlOPnNzrz3jm-5z8uQl6CjCcrVHUHJ75pGC8r9UOlS8cOgeXQB5dYP-fOWyo5CNadlozx1S2meCIxncbQRV1kCBi4KU";
-    static final String VALID_SERVICE_TICKET_ISSUER =
-        "3:serv:CBAQ__________9_IgsI5QEQHCDr1MT4Ag:Gu66XJT_nKnIRJjFy1561wFhIqkJItcSTGftLo7Yvi7i5wIdV-QuKT_-IMPpgjxnn" +
-        "Gbt1Dy3Ys2TEoeJAb0TdaCYG1uy3vpoLONmTx9AenN5dx1HHf46cypLK5D3OdiTjxvqI9uGmSIKrSdRxU8gprpu5QiBDPZqVCWhM60FVSY";
-
-    @Test(expected = MalformedTvmKeysException.class)
-    public void malformedTvmKeys() {
-        ServiceContext.create(OUR_ID, SECRET, MALFORMED_TVM_KEYS);
-    }
-
-    @Test(expected = EmptyTvmKeysException.class)
-    public void emptyTvmKeys() {
-        ServiceContext.create(OUR_ID, SECRET, EMPTY_TVM_KEYS);
-    }
-
-    @Test(expected = MalformedTvmSecretException.class)
-    public void mslformedSecret() {
-        ServiceContext.create(OUR_ID, MALFORMED_TVM_SECRET, Unittest.getTvmknifePublicKeys());
-    }
-
-    @Test(expected = MalformedTvmKeysException.class)
-    public void malformedTvmKeys_badBase64url() {
-        ServiceContext.create(OUR_ID, SECRET, "adcvxcv./-+");
-    }
-
-    @Test(expected = MalformedTvmSecretException.class)
-    public void checkingCtxTriesToSign() {
-        ServiceContext context = ServiceContext.create(OUR_ID, Unittest.getTvmknifePublicKeys());
-        context.signCgiParamsForTvm(String.valueOf(Long.MAX_VALUE), "13,28", "");
-    }
-
-    @Test
-    public void validCheckingCtx() {
-        ServiceContext context = ServiceContext.create(OUR_ID, Unittest.getTvmknifePublicKeys());
-    }
-
-    @Test(expected = EmptyTvmKeysException.class)
-    public void signingCtxTriesToCheck() {
-        ServiceContext context = ServiceContext.create(SECRET, OUR_ID);
-        context.check("abcde");
-    }
-
-    @Test
-    public void contextExceptionsTest_ValidSingingCtx() {
-        ServiceContext context = ServiceContext.create(SECRET, OUR_ID);
-    }
-
-    @Test
-    public void contextSignTest() {
-        ServiceContext context = ServiceContext.create(OUR_ID, SECRET, Unittest.getTvmknifePublicKeys());
-        Assert.assertEquals(
-            "NsPTYak4Cfk-4vgau5lab3W4GPiTtb2etuj3y4MDPrk",
-            context.signCgiParamsForTvm(String.valueOf(Long.MAX_VALUE), "13,28", "")
-        );
-    }
-
-    @Test
-    public void ticket1Test() {
-        ServiceContext context = ServiceContext.create(OUR_ID, SECRET, Unittest.getTvmknifePublicKeys());
-        CheckedServiceTicket checkedTicket = context.check(VALID_SERVICE_TICKET_1);
-        Assert.assertEquals(TicketStatus.OK, checkedTicket.getStatus());
-        Assert.assertEquals(SRC_ID, checkedTicket.getSrc());
-        Assert.assertEquals(
-            "ticket_type=serv;expiration_time=9223372036854775807;src=229;dst=28;scope=bb:sess1;scope=bb:sess2;",
-            checkedTicket.debugInfo());
-        Assert.assertEquals(0, checkedTicket.getIssuerUid());
-    }
-
-    @Test
-    public void ticket3Test() {
-        ServiceContext context = ServiceContext.create(OUR_ID, SECRET, Unittest.getTvmknifePublicKeys());
-        CheckedServiceTicket checkedTicket = context.check(VALID_SERVICE_TICKET_3);
-        Assert.assertEquals(TicketStatus.OK, checkedTicket.getStatus());
-        Assert.assertEquals(
-            "ticket_type=serv;expiration_time=9223372036854775807;src=229;dst=28;",
-            checkedTicket.debugInfo());
-        Assert.assertEquals(0, checkedTicket.getIssuerUid());
-    }
-
-    @Test
-    public void ticketIssuerTest() {
-        ServiceContext context = ServiceContext.create(OUR_ID, SECRET, Unittest.getTvmknifePublicKeys());
-        CheckedServiceTicket checkedTicket = context.check(VALID_SERVICE_TICKET_ISSUER);
-        Assert.assertEquals(TicketStatus.OK, checkedTicket.getStatus());
-        Assert.assertEquals(
-            "ticket_type=serv;expiration_time=9223372036854775807;src=229;dst=28;issuer_uid=789654123;",
-            checkedTicket.debugInfo());
-        Assert.assertEquals(789654123, checkedTicket.getIssuerUid());
-    }
-
-    @Test
-    public void ticketErrorsTest() {
-        ServiceContext context = ServiceContext.create(NOT_OUR_ID, SECRET, Unittest.getTvmknifePublicKeys());
-        CheckedServiceTicket checkedTicket1 = context.check(VALID_SERVICE_TICKET_1);
-        Assert.assertEquals(TicketStatus.INVALID_DST, checkedTicket1.getStatus());
-
-        CheckedServiceTicket checkedTicket2 = context.check(UNSUPPORTED_VERSION_SERVICE_TICKET);
-        Assert.assertEquals(TicketStatus.UNSUPPORTED_VERSION, checkedTicket2.getStatus());
-
-        CheckedServiceTicket checkedTicket3 = context.check(EXPIRED_SERVICE_TICKET);
-        Assert.assertEquals(TicketStatus.EXPIRED, checkedTicket3.getStatus());
-    }
-
-    @Test(expected = NotAllowedException.class)
-    public void ticketException2Test() {
-        ServiceContext context = ServiceContext.create(OUR_ID, SECRET, Unittest.getTvmknifePublicKeys());
-        CheckedServiceTicket checkedTicket = context.check(EXPIRED_SERVICE_TICKET);
-        Assert.assertEquals(TicketStatus.EXPIRED, checkedTicket.getStatus());
-        checkedTicket.getSrc();
-    }
-
-    @Test
-    public void ticketNoExceptionTest() {
-        ServiceContext context = ServiceContext.create(OUR_ID, SECRET, Unittest.getTvmknifePublicKeys());
-        CheckedServiceTicket checkedTicket = context.check(EXPIRED_SERVICE_TICKET);
-        Assert.assertEquals(TicketStatus.EXPIRED, checkedTicket.getStatus());
-        checkedTicket.booleanValue();
-        checkedTicket.debugInfo();
-        checkedTicket.getStatus();
-    }
-
-    @Test
-    public void removeSignatureTest() {
-        Assert.assertEquals(
-            "1:serv:ASDkljbjhsdbfLJHABFJHBslfbsfjs:asdxcvbxcvniueliuweklsvds",
-            Utils.removeTicketSignature("1:serv:ASDkljbjhsdbfLJHABFJHBslfbsfjs:asdxcvbxcvniueliuweklsvds")
-        );
-    }
-
-    @Test
-    public void createTicketForTests() {
-        CheckedServiceTicket s = Unittest.createServiceTicket(TicketStatus.OK, 42, 0);
-        Assert.assertEquals(TicketStatus.OK, s.getStatus());
-    }
-}
diff --git a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/TvmApiTest.java b/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/TvmApiTest.java
deleted file mode 100644
index acfcdc5d35a..00000000000
--- a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/TvmApiTest.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.HashMap;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import ru.yandex.passport.tvmauth.exception.BrokenTvmClientSettings;
-import ru.yandex.passport.tvmauth.roles.Roles;
-
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-
-public class TvmApiTest {
-    static final String SRV_TICKET =
-        "3:serv:CBAQ__________9_IgYIexCUkQY:GioCM49Ob6_f80y6FY0XBVN4hLXuMlFeyMvIMiDuQnZkbkLpRpQOuQo5YjWoBjM0Vf-XqOm8" +
-        "B7xtrvxSYHDD7Q4OatN2l-Iwg7i71lE3scUeD36x47st3nd0OThvtjrFx_D8mw_c0GT5KcniZlqq1SjhLyAk1b_zJsx8viRAhCU";
-    static final String PROD_TICKET =
-        "3:user:CAsQ__________9_Gg4KAgh7EHsg0oXYzAQoAA:N8PvrDNLh-5JywinxJntLeQGDEHBUxfzjuvB8-_BEUv1x9CALU7do8irDlDYV" +
-        "eVVDr4AIpR087YPZVzWPAqmnBuRJS0tJXekmDDvrivLnbRrzY4IUXZ_fImB0fJhTyVetKv6RD11bGqnAJeDpIukBwPTbJc_EMvKDt8V490C" +
-        "JFw";
-    static final String TEST_TICKET =
-        "3:user:CA0Q__________9_Gg4KAgh7EHsg0oXYzAQoAQ:FSADps3wNGm92Vyb1E9IVq5M6ZygdGdt1vafWWEhfDDeCLoVA-sJesxMl2pGW" +
-        "4OxJ8J1r_MfpG3ZoBk8rLVMHUFrPa6HheTbeXFAWl8quEniauXvKQe4VyrpA1SPgtRoFqi5upSDIJzEAe1YRJjq1EClQ_slMt8R0kA_JjKU" +
-        "X54";
-
-    @Test
-    public void createSettings_Factory() {
-        TvmApiSettings.create();
-    }
-
-    @Test(expected = BrokenTvmClientSettings.class)
-    public void createSettings_Empty() {
-        TvmApiSettings s = TvmApiSettings.create();
-        new NativeTvmClient(s);
-    }
-
-    @Test
-    public void createSettings_BadSelfTvmId() {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.setSelfTvmId(0);
-    }
-
-    @Test
-    public void createSettings_SelfTvmId() {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.setSelfTvmId(1);
-    }
-
-    @Test
-    public void createSettings_NoSelfTvmId() {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.enableServiceTicketChecking();
-    }
-
-    @Test
-    public void createSettings_UserTickets() {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.enableUserTicketChecking(BlackboxEnv.PROD_YATEAM);
-    }
-
-    @Test
-    public void createSettings_PermissionOk() {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.setDiskCacheDir("./");
-    }
-
-    @Test
-    public void createSettings_badSelfSecret_Map() {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.setSelfTvmId(1);
-        HashMap<String, Integer> m = new HashMap<String, Integer>();
-        m.put("a", 1);
-        s.enableServiceTicketsFetchOptions("", m);
-    }
-
-    @Test
-    public void createSettings_badSelfSecret_Array() {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.setSelfTvmId(1);
-        s.enableServiceTicketsFetchOptions("", new int[]{1, 2});
-    }
-
-    @Test
-    public void createSettings_noSelfTvmId_Map() {
-        TvmApiSettings s = TvmApiSettings.create();
-        HashMap<String, Integer> m = new HashMap<String, Integer>();
-        m.put("a", 1);
-        s.enableServiceTicketsFetchOptions("qwe", m);
-    }
-
-    @Test
-    public void createSettings_noSelfTvmId_Array() {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.enableServiceTicketsFetchOptions("qwe", new int[]{1, 2});
-    }
-
-    @Test
-    public void createSettings_noDst_Map() {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.setSelfTvmId(1);
-        s.enableServiceTicketsFetchOptions("qwe", new HashMap<String, Integer>());
-    }
-
-    @Test
-    public void createSettings_noDst_Array() {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.setSelfTvmId(1);
-        s.enableServiceTicketsFetchOptions("qwe", new int[]{});
-    }
-
-    @Test
-    public void createSettings_setHost() {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.setTvmPortForLocalhost(443);
-    }
-
-    @Test
-    public void createSettings_Map() {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.setSelfTvmId(1);
-        HashMap<String, Integer> m = new HashMap<String, Integer>();
-        m.put("a", 1);
-        s.enableServiceTicketsFetchOptions("qwe", m);
-    }
-
-    @Test
-    public void createSettings_Array() {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.setSelfTvmId(1);
-        s.enableServiceTicketsFetchOptions("qwe", new int[]{1, 2});
-    }
-
-    public void statusEquals() {
-        Assert.assertTrue(ClientStatus.Code.OK.equals(new ClientStatus(ClientStatus.Code.OK, "")));
-        Assert.assertEquals(ClientStatus.Code.OK, new ClientStatus(ClientStatus.Code.OK, ""));
-    }
-
-    @Test(expected = BrokenTvmClientSettings.class)
-    public void createClient_BadCfg() {
-        new NativeTvmClient(TvmApiSettings.create());
-    }
-
-    @Test
-    public void createClient_full() throws IOException {
-        NativeTvmClient c = factory();
-        Assert.assertEquals(ClientStatus.Code.OK, c.getStatus().getCode());
-        Assert.assertEquals("OK", c.getStatus().getLastError());
-        Assert.assertEquals("3:serv:CBAQ__________9_IgYIKhCUkQY:CX", c.getServiceTicketFor("dest"));
-        Assert.assertEquals("3:serv:CBAQ__________9_IgYIKhCUkQY:CX", c.getServiceTicketFor(19));
-        Assert.assertEquals(TicketStatus.OK, c.checkServiceTicket(SRV_TICKET).getStatus());
-        Assert.assertEquals(TicketStatus.OK, c.checkUserTicket(TEST_TICKET).getStatus());
-        Assert.assertEquals(TicketStatus.INVALID_BLACKBOX_ENV, c.checkUserTicket(PROD_TICKET).getStatus());
-        Assert.assertEquals(
-            TicketStatus.INVALID_BLACKBOX_ENV,
-            c.checkUserTicket(TEST_TICKET, BlackboxEnv.PROD).getStatus());
-        Assert.assertEquals(TicketStatus.OK, c.checkUserTicket(PROD_TICKET, BlackboxEnv.PROD).getStatus());
-        c.close();
-
-        String content = new String(Files.readAllBytes(Paths.get("./common.log")),
-                                    StandardCharsets.US_ASCII);
-        String exp = "INFO File './service_tickets' was successfully read\n" +
-                     "INFO Got 1 service ticket(s) from disk\n" +
-                     "INFO Cache was updated with 1 service ticket(s): 2050-01-01T00:00:00.000000Z\n" +
-                     "INFO File './public_keys' was successfully read\n" +
-                     "INFO Cache was updated with public keys: 2050-01-01T00:00:00.000000Z\n" +
-                     "DEBUG File './retry_settings' does not exist\n" +
-                     "DEBUG Thread-worker started\n" +
-                     "DEBUG Thread-worker stopped\n";
-        System.out.println(content);
-        Assert.assertTrue(content.endsWith(exp));
-    }
-
-    @Test(expected = BrokenTvmClientSettings.class)
-    public void createClient_BrokenTvmClientSettings() throws IOException {
-        NativeTvmClient c = factory();
-        Assert.assertEquals("3:serv:CBAQ__________9_IgYIKhCUkQY:CX", c.getServiceTicketFor(1));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void createClient_getTicketFromStoppedClient() throws IOException {
-        NativeTvmClient c = factory();
-        c.close();
-        c.close();
-        Assert.assertEquals("3:serv:CBAQ__________9_IgYIKhCUkQY:CX", c.getServiceTicketFor(1));
-    }
-
-    private static NativeTvmClient factory() throws IOException {
-        TvmApiSettings s = TvmApiSettings.create();
-        s.setSelfTvmId(100500);
-        HashMap<String, Integer> map = new HashMap<String, Integer>();
-        map.put("dest", 19);
-        s.enableServiceTicketsFetchOptions("qwe", map);
-        s.enableServiceTicketChecking();
-        s.enableUserTicketChecking(BlackboxEnv.TEST);
-        Files.copy(
-            Paths.get(ru.yandex.devtools.test.Paths.getSourcePath(
-                "/library/cpp/tvmauth/client/ut/files/public_keys"
-            )),
-            Paths.get("./public_keys"),
-            REPLACE_EXISTING);
-        Files.copy(
-            Paths.get(ru.yandex.devtools.test.Paths.getSourcePath(
-                "/library/cpp/tvmauth/client/ut/files/service_tickets"
-            )),
-            Paths.get("./service_tickets"),
-            REPLACE_EXISTING);
-        s.setDiskCacheDir("./");
-        return new NativeTvmClient(s);
-    }
-}
-
-class TestTvmClient implements TvmClient {
-    @Override
-    public ClientStatus getStatus() {
-        return new ClientStatus(ClientStatus.Code.OK, "OK");
-    }
-
-    @Override
-    public String getServiceTicketFor(String alias) {
-        return "someticket";
-    }
-
-    @Override
-    public String getServiceTicketFor(int tvmId) {
-        return "someticket";
-    }
-
-    @Override
-    public CheckedServiceTicket checkServiceTicket(String ticketBody) {
-        return null;
-    }
-
-    @Override
-    public CheckedUserTicket checkUserTicket(String ticketBody) {
-        return null;
-    }
-
-    @Override
-    public CheckedUserTicket checkUserTicket(String ticketBody, BlackboxEnv overridedBbEnv) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Roles getRoles() {
-        return null;
-    }
-
-    @Override
-    public void close() {
-    }
-}
diff --git a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/TvmToolTest.java b/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/TvmToolTest.java
deleted file mode 100644
index ea8eccea920..00000000000
--- a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/TvmToolTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import ru.yandex.passport.tvmauth.exception.NonRetriableException;
-
-public class TvmToolTest {
-    static final String TIME_REGEX = "\\d{4}-\\d\\d-\\d\\dT\\d\\d:\\d\\d:\\d\\d.\\d{6}Z";
-
-    static String readAuthToken() throws IOException {
-        return new String(Files.readAllBytes(Paths.get("./tvmtool.authtoken")), StandardCharsets.UTF_8);
-    }
-
-    static int readPort() throws IOException {
-        return Integer.parseInt(
-            new String(Files.readAllBytes(Paths.get("./tvmtool.port")), StandardCharsets.UTF_8)
-        );
-    }
-
-    @Test
-    public void createSettings() {
-        TvmToolSettings s = TvmToolSettings.create("me");
-        s.setPort(8080);
-        s.setHostname("localhost");
-        s.setAuthToken("qwerty");
-        s.close();
-        s.close();
-    }
-
-    @Test(expected = NonRetriableException.class)
-    public void createClientWithBadTvmtool_Alias() throws IOException {
-        TvmToolSettings s = TvmToolSettings.create("no one");
-        s.setPort(readPort());
-        s.setAuthToken(readAuthToken());
-        NativeTvmClient c = new NativeTvmClient(s);
-    }
-
-    @Test(expected = NonRetriableException.class)
-    public void createClientWithBadTvmtool_Port() throws IOException {
-        TvmToolSettings s = TvmToolSettings.create("me");
-        s.setPort(0);
-        s.setAuthToken(readAuthToken());
-        NativeTvmClient c = new NativeTvmClient(s);
-    }
-
-    @Test
-    public void createClientWithOkTvmtool() throws IOException {
-        TvmToolSettings s = TvmToolSettings.create("me");
-        s.setPort(readPort());
-        s.setAuthToken(readAuthToken());
-        s.overrideBlackboxEnv(BlackboxEnv.PROD);
-
-        NativeTvmClient c = new NativeTvmClient(s);
-        Assert.assertEquals(
-            ClientStatus.Code.OK,
-            c.getStatus().getCode());
-        c.close();
-
-        String content = new String(Files.readAllBytes(Paths.get("./common.log")),
-                                    StandardCharsets.US_ASCII);
-        String exp = "DEBUG Meta info fetched from localhost:" + Integer.toString(readPort()) + "\n" +
-                     "INFO Meta: self_tvm_id=1000502, bb_env=ProdYateam, idm_slug=some_slug_2," +
-                     " dsts=[(2028120:2028120)]\n" +
-                     "INFO Meta: override blackbox env: ProdYateam->Prod\n" +
-                     "DEBUG Tickets fetched from tvmtool: XXXXXXXXXXX\n" +
-                     "DEBUG Public keys fetched from tvmtool: XXXXXXXXXXX\n" +
-                     "DEBUG Succeed to update roles with revision some_revision_2\n" +
-                     "DEBUG Thread-worker started\n" +
-                     "DEBUG Thread-worker stopped\n";
-        content = content.replaceAll(TIME_REGEX, "XXXXXXXXXXX");
-        content = content.replaceAll("\\(she:100501\\)\\(he:100500\\)", "(he:100500)(she:100501)");
-        System.out.println(content);
-        Assert.assertTrue(content.endsWith(exp));
-    }
-}
diff --git a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/UserTest.java b/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/UserTest.java
deleted file mode 100644
index af8f8eb6b5c..00000000000
--- a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/UserTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package ru.yandex.passport.tvmauth.deprecated;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import ru.yandex.passport.tvmauth.BlackboxEnv;
-import ru.yandex.passport.tvmauth.CheckedUserTicket;
-import ru.yandex.passport.tvmauth.TicketStatus;
-import ru.yandex.passport.tvmauth.Unittest;
-import ru.yandex.passport.tvmauth.Utils;
-import ru.yandex.passport.tvmauth.exception.EmptyTvmKeysException;
-import ru.yandex.passport.tvmauth.exception.MalformedTvmKeysException;
-import ru.yandex.passport.tvmauth.exception.NotAllowedException;
-
-public class UserTest {
-    static final String EMPTY_TVM_KEYS =
-        "1:EpUBCpIBCAYQABqHATCBhAKBgQCoZkFGm9oLTqjeXZAq6j5S6i7K20V0lNdBBLqfmFBIRuTkYxhs4vUYnWjZrKRAd5bp6_py0csmFmpl_" +
-        "5Yh0b-2pdo_E5PNP7LGRzKyKSiFddyykKKzVOazH8YYldDAfE8Z5HoS9e48an5JsPg0jr-TPu34DnJq3yv2a6dqiKL9zSCakQY";
-    static final String EXPIRED_USER_TICKET =
-        "3:user:CA0QABokCgMIyAMKAgh7EMgDGghiYjpzZXNzMRoIYmI6c2VzczIgEigB:D0CmYVwWg91LDYejjeQ2UP8AeiA_mr1q1CUD_lfJ9zQ" +
-        "SEYEOYGDTafg4Um2rwOOvQnsD1JHM4zHyMUJ6Jtp9GAm5pmhbXBBZqaCcJpyxLTEC8a81MhJFCCJRvu_G1FiAgRgB25gI3HIbkvHFUEqAIC" +
-        "_nANy7NFQnbKk2S-EQPGY";
-    static final String MALFORMED_TVM_KEYS =
-        "1:CpgCCpMCCAEQABqIAjCCAQQCggEAcLEXeH67FQESFUn4_7wnX7wN0PUrBoUsm3QQ4W5vC-qz6sXaEjSwnTV8w1o-z6X9KPLlhzMQvuS38" +
-        "NCNfK4uvJ4Zvfp3YsXJ25-rYtbnrYJHNvHohD-kPCCw_yZpMp21JdWigzQGuV7CtrxUhF-NNrsnUaJrE5-OpEWNt4X6nCItKIYeVcSK6XJU" +
-        "bEWbrNCRbvkSc4ak2ymFeMuHYJVjxh4eQbk7_ZPzodP0WvF6eUYrYeb42imVEOR8ofVLQWE5DVnb1z_TqZm4i1XkS7jMwZuBxBRw8DGdYei" +
-        "0lT_sAf7KST2jC0590NySB3vsBgWEVs1OdUUWA6r-Dvx9dsOQtSCVkQYQAAqZAgqUAggCEAAaiQIwggEFAoIBAQDhEBM5-6YsPWfogKtblu" +
-        "JoCX1WV2KdzOaQ0-OlRbBzeCzw-eQKu12c8WakHBbeCMd1I1TU64SDkDorWjXGIa_2xT6N3zzNAE50roTbPCcmeQrps26woTYfYIuqDdoxY" +
-        "KZNr0lvNLLW47vBr7EKqo1S4KSj7aXK_XYeEvUgIgf3nVIcNrio7VTnFmGGVQCepaL1Hi1gN4yIXjVZ06PBPZ-DxSRu6xOGbFrfKMJeMPs7" +
-        "KOyE-26Q3xOXdTIa1X-zYIucTd_bxUCL4BVbwW2AvbbFsaG7ISmVdGu0XUTmhXs1KrEfUVLRJhE4Dx99hAZXm1_HlYMUeJcMQ_oHOhV94EN" +
-        "FIJaRBhACCpYBCpEBCAMQABqGATCBgwKBgF9t2YJGAJkRRFq6fWhi3m1TFW1UOE0f6ZrfYhHAkpqGlKlh0QVfeTNPpeJhi75xXzCe6oReRU" +
-        "m-0DbqDNhTShC7uGUv1INYnRBQWH6E-5Fc5XrbDFSuGQw2EYjNfHy_HefHJXxQKAqPvxBDKMKkHgV58WtM6rC8jRi9sdX_ig2NIJeRBhABC" +
-        "pYBCpEBCAQQABqGATCBgwKBgGB4d6eLGUBv-Q6EPLehC4S-yuE2HB-_rJ7WkeYwyp-xIPolPrd-PQme2utHB4ZgpXHIu_OFksDe_0bPgZni" +
-        "NRSVRbl7W49DgS5Ya3kMfrYB4DnF5Fta5tn1oV6EwxYD4JONpFTenOJALPGTPawxXEfon_peiHOSBuQMu3_Vn-l1IJiRBhADCpcBCpIBCAU" +
-        "QABqHATCBhAKBgQCTJMKIfmfeZpaI7Q9rnsc29gdWawK7TnpVKRHws1iY7EUlYROeVcMdAwEqVM6f8BVCKLGgzQ7Gar_uuxfUGKwqEQzopp" +
-        "Draw4F75J464-7D5f6_oJQuGIBHZxqbMONtLjBCXRUhQW5szBLmTQ_R3qaJb5vf-h0APZfkYhq1cTttSCZkQYQBAqWAQqRAQgLEAAahgEwg" +
-        "YMCgYBvvGVH_M2H8qxxv94yaDYUTWbRnJ1uiIYc59KIQlfFimMPhSS7x2tqUa2-hI55JiII0Xym6GNkwLhyc1xtWChpVuIdSnbvttbrt4we" +
-        "DMLHqTwNOF6qAsVKGKT1Yh8yf-qb-DSmicgvFc74mBQm_6gAY1iQsf33YX8578ClhKBWHSCVkQYQAAqXAQqSAQgMEAAahwEwgYQCgYEAkuz" +
-        "Fcd5TJu7lYWYe2hQLFfUWIIj91BvQQLa_Thln4YtGCO8gG1KJqJm-YlmJOWQG0B7H_5RVhxUxV9KpmFnsDVkzUFKOsCBaYGXc12xPVioawU" +
-        "lAwp5qp3QQtZyx_se97YIoLzuLr46UkLcLnkIrp-Jo46QzYi_QHq45WTm8MQ0glpEGEAIKlwEKkgEIDRAAGocBMIGEAoGBAIUzbxOknXf_r" +
-        "Nt17_ir8JlWvrtnCWsQd1MAnl5mgArvavDtKeBYHzi5_Ak7DHlLzuA6YE8W175FxLFKpN2hkz-l-M7ltUSd8N1BvJRhK4t6WffWfC_1wPyo" +
-        "AbeSN2Yb1jygtZJQ8wGoXHcJQUXiMit3eFNyylwsJFj1gzAR4JCdIJeRBhABCpYBCpEBCA4QABqGATCBgwKBgFMcbEpl9ukVR6AO_R6sMyi" +
-        "U11I8b8MBSUCEC15iKsrVO8v_m47_TRRjWPYtQ9eZ7o1ocNJHaGUU7qqInFqtFaVnIceP6NmCsXhjs3MLrWPS8IRAy4Zf4FKmGOx3N9O2ve" +
-        "mjUygZ9vUiSkULdVrecinRaT8JQ5RG4bUMY04XGIwFIJiRBhADCpYBCpEBCA8QABqGATCBgwKBgGpCkW-NR3li8GlRvqpq2YZGSIgm_PTyD" +
-        "I2Zwfw69grsBmPpVFW48Vw7xoMN35zcrojEpialB_uQzlpLYOvsMl634CRIuj-n1QE3-gaZTTTE8mg-AR4mcxnTKThPnRQpbuOlYAnriwia" +
-        "sWiQEMbGjq_HmWioYYxFo9USlklQn4-9IJmRBhAEEpUBCpIBCAYQABqHATCBhAKBgQCoZkFGm9oLTqjeXZAq6j5S6i7K20V0lNdBBLqfmFB" +
-        "IRuTkYxhs4vUYnWjZrKRAd5bp6_py0csmFmpl_5Yh0b-2pdo_E5PNP7LGRzKyKSiFddyykKKzVOazH8YYldDAfE8Z5HoS9e48an5JsPg0jr" +
-        "-TPu34DnJq3yv2a6dqiKL9zSCakQYSlQEKkgEIEBAAGocBMIGEAoGBALhrihbf3EpjDQS2sCQHazoFgN0nBbE9eesnnFTfzQELXb2gnJU9e" +
-        "nmV_aDqaHKjgtLIPpCgn40lHrn5k6mvH5OdedyI6cCzE-N-GFp3nAq0NDJyMe0fhtIRD__CbT0ulcvkeow65ubXWfw6dBC2gR_34rdMe_L_" +
-        "TGRLMWjDULbNIJ";
-    static final String MALFORMED_USER_TICKET =
-        "3:user:CA0Q__________9_GiQKAwjIAwoCCHsQyAMaCGJiOnNlc3MxGghiYjpzZXlFrhMW-R4q8mKfXJXCd-RBVBgUQzCOR1Dx2FiOyU-B" +
-        "xUoIsaU0PiwTjbVY5I2onJDilge70Cl5zEPI9pfab2qwklACq_ZBUvD1tzrfNUr88otBGAziHASJWgyVDkhyQ3p7YbN38qpb0vGQrYNxlk4" +
-        "e2I";
-    static final String UNSUPPORTED_VERSION_USER_TICKET =
-        "2:user:CA0Q__________9_GiQKAwjIAwoCCHsQyAMaCGJiOnNlc3MxGghiYjpzZXNzMiASKAE:KJFv5EcXn9krYk19LCvlFrhMW-R4q8mK" +
-        "fXJXCd-RBVBgUQzCOR1Dx2FiOyU-BxUoIsaU0PiwTjbVY5I2onJDilge70Cl5zEPI9pfab2qwklACq_ZBUvD1tzrfNUr88otBGAziHASJWg" +
-        "yVDkhyQ3p7YbN38qpb0vGQrYNxlk4e2I";
-    static final String USER_TICKET_PROTOBUF = "CA0Q__________9_GiQKAwjIAwoCCHsQyAMaCGJiOnNlc3MxGghiYjpzZXNzMiASKAE";
-    static final String VALID_USER_TICKET_1 =
-        "3:user:CA0Q__________9_GjQKAgh7CgkIoN71iqr3gAIQoN71iqr3gAIaCGJiOnNlc3MxGghiYjpzZXNzMiDShdjMBCgB:KJhfloe9EFf" +
-        "x1P3fs6JWXipyQuQRuxSM_PCHxdpeLvCcxMZcLU_PG91aRxY2_ieNH5cMJn88JitIIsI6TMeTOKW1wLMoEJHrcSPkE6-EZh9D4agY1wKCEq" +
-        "7ArCLjR5Jg38RgMt0b8sUhNumeHphsgdzGxWqRyOOkoI2Qp_y1Z3Y";
-    static final String VALID_USER_TICKET_2 =
-        "3:user:CA0Q__________9_GhAKAwjIAwoCCHsQyAMgEigB:KRibGYTJUA2ns0Fn7VYqeMZ1-GdscB1o9pRzELyr7QJrJsfsE8Y_HoVvB8N" +
-        "pr-oalv6AXOpagSc8HpZjAQz8zKMAVE_tI0tL-9DEsHirpawEbpy7OWV7-k18o1m-RaDaKeTlIB45KHbBul1-9aeKkortBfbbXtz_Qy9r_m" +
-        "fFPiQ";
-
-    @Test
-    public void contextTest() {
-        UserContext.create(BlackboxEnv.PROD, Unittest.getTvmknifePublicKeys());
-    }
-
-    @Test(expected = EmptyTvmKeysException.class)
-    public void contextExceptions1Test() {
-        UserContext.create(BlackboxEnv.PROD, EMPTY_TVM_KEYS);
-    }
-
-    @Test(expected = MalformedTvmKeysException.class)
-    public void contextExceptions2Test() {
-        UserContext.create(BlackboxEnv.PROD, MALFORMED_TVM_KEYS);
-    }
-
-    @Test
-    public void ticket1Test() {
-        UserContext context = UserContext.create(BlackboxEnv.TEST, Unittest.getTvmknifePublicKeys());
-        CheckedUserTicket checkedTicket = context.check(VALID_USER_TICKET_1);
-        Assert.assertEquals(TicketStatus.OK, checkedTicket.getStatus());
-        Assert.assertArrayEquals(new long[]{123, 1130000012898080L}, checkedTicket.getUids());
-        Assert.assertEquals(1130000012898080L, checkedTicket.getDefaultUid());
-        Assert.assertArrayEquals(new String[]{"bb:sess1", "bb:sess2"}, checkedTicket.getScopes());
-        Assert.assertTrue(checkedTicket.hasScope("bb:sess1"));
-        Assert.assertTrue(checkedTicket.hasScope("bb:sess2"));
-        Assert.assertFalse(checkedTicket.hasScope("bb:sess3"));
-        Assert.assertEquals(
-            "ticket_type=user;expiration_time=9223372036854775807;scope=bb:sess1;scope=bb:sess2;" +
-            "default_uid=1130000012898080;uid=123;uid=1130000012898080;env=Test;",
-            checkedTicket.debugInfo());
-    }
-
-    @Test
-    public void ticket2Test() {
-        UserContext context = UserContext.create(BlackboxEnv.TEST, Unittest.getTvmknifePublicKeys());
-        CheckedUserTicket checkedTicket = context.check(VALID_USER_TICKET_2);
-        Assert.assertEquals(TicketStatus.OK, checkedTicket.getStatus());
-        Assert.assertEquals(
-            "ticket_type=user;expiration_time=9223372036854775807;default_uid=456;uid=456;uid=123;env=Test;",
-            checkedTicket.debugInfo());
-    }
-
-    @Test
-    public void ticketErrorsTest() {
-        UserContext context = UserContext.create(BlackboxEnv.PROD, Unittest.getTvmknifePublicKeys());
-        CheckedUserTicket checkedTicket1 = context.check(VALID_USER_TICKET_1);
-        Assert.assertEquals(TicketStatus.INVALID_BLACKBOX_ENV, checkedTicket1.getStatus());
-
-        CheckedUserTicket checkedTicket2 = context.check(UNSUPPORTED_VERSION_USER_TICKET);
-        Assert.assertEquals(TicketStatus.UNSUPPORTED_VERSION, checkedTicket2.getStatus());
-
-        CheckedUserTicket checkedTicket3 = context.check(EXPIRED_USER_TICKET);
-        Assert.assertEquals(TicketStatus.EXPIRED, checkedTicket3.getStatus());
-    }
-
-    @Test(expected = NotAllowedException.class)
-    public void ticketException1Test() {
-        UserContext context = UserContext.create(BlackboxEnv.TEST, Unittest.getTvmknifePublicKeys());
-        CheckedUserTicket checkedTicket = context.check(EXPIRED_USER_TICKET);
-        Assert.assertEquals(TicketStatus.EXPIRED, checkedTicket.getStatus());
-        checkedTicket.getScopes();
-    }
-
-    @Test(expected = NotAllowedException.class)
-    public void ticketException2Test() {
-        UserContext context = UserContext.create(BlackboxEnv.TEST, Unittest.getTvmknifePublicKeys());
-        CheckedUserTicket checkedTicket = context.check(EXPIRED_USER_TICKET);
-        Assert.assertEquals(TicketStatus.EXPIRED, checkedTicket.getStatus());
-        checkedTicket.getUids();
-    }
-
-    @Test(expected = NotAllowedException.class)
-    public void ticketException3Test() {
-        UserContext context = UserContext.create(BlackboxEnv.TEST, Unittest.getTvmknifePublicKeys());
-        CheckedUserTicket checkedTicket = context.check(EXPIRED_USER_TICKET);
-        Assert.assertEquals(TicketStatus.EXPIRED, checkedTicket.getStatus());
-        checkedTicket.getDefaultUid();
-    }
-
-    @Test(expected = NotAllowedException.class)
-    public void ticketException4Test() {
-        UserContext context = UserContext.create(BlackboxEnv.TEST, Unittest.getTvmknifePublicKeys());
-        CheckedUserTicket checkedTicket = context.check(EXPIRED_USER_TICKET);
-        Assert.assertEquals(TicketStatus.EXPIRED, checkedTicket.getStatus());
-        checkedTicket.hasScope("");
-    }
-
-    @Test
-    public void ticketNoExceptionTest() {
-        UserContext context = UserContext.create(BlackboxEnv.TEST, Unittest.getTvmknifePublicKeys());
-        CheckedUserTicket checkedTicket = context.check(EXPIRED_USER_TICKET);
-        Assert.assertEquals(TicketStatus.EXPIRED, checkedTicket.getStatus());
-        checkedTicket.booleanValue();
-        checkedTicket.debugInfo();
-        checkedTicket.getStatus();
-    }
-
-    @Test
-    public void removeSignatureTest() {
-        Assert.assertEquals(
-            "1:serv:ASDkljbjhsdbfLJHABFJHBslfbsfjs:asdxcvbxcvniueliuweklsvds",
-            Utils.removeTicketSignature("1:serv:ASDkljbjhsdbfLJHABFJHBslfbsfjs:asdxcvbxcvniueliuweklsvds")
-        );
-    }
-
-    @Test
-    public void createTicketForTests() {
-        CheckedUserTicket u = Unittest.createUserTicket(
-            TicketStatus.OK,
-            42,
-            new String[]{"a", "b", "c"},
-            new long[]{24, 57});
-        Assert.assertEquals(TicketStatus.OK, u.getStatus());
-        Assert.assertArrayEquals(new long[]{24, 42, 57}, u.getUids());
-        Assert.assertEquals(42, u.getDefaultUid());
-    }
-}
diff --git a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/VersionTest.java b/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/VersionTest.java
deleted file mode 100644
index d6d174af91a..00000000000
--- a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/VersionTest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package ru.yandex.passport.tvmauth;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class VersionTest {
-    @Test
-    public void versionGetTest() {
-        Assert.assertEquals(true, Version.get().startsWith("java_"));
-        Assert.assertTrue(Version.get().length() >= 10);
-    }
-}
diff --git a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/roles/ConsumerRolesTest.java b/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/roles/ConsumerRolesTest.java
deleted file mode 100644
index e4267b7f5fa..00000000000
--- a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/roles/ConsumerRolesTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package ru.yandex.passport.tvmauth.roles;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import ru.yandex.passport.tvmauth.TicketStatus;
-import ru.yandex.passport.tvmauth.Unittest;
-
-public class ConsumerRolesTest {
-    private Roles createRoles() {
-        return RolesParser.parse("{\"revision\":\"GYYDEMJUGBQWC\",\"born_date\":1612791978," +
-            "\"tvm\":{\"2012192\":{\"/group/system/system_on/abc/role/impersonator/\":[{\"scope\":\"/\"}]}}," +
-            "\"user\":{\"1120000000000493\":{\"/group/system/system_on/abc/role/roles_manage/\":[]}}}");
-    }
-
-    @Test
-    public void commonTest() {
-        Roles roles = createRoles();
-        ConsumerRoles consumerRoles = roles.getRolesForService(
-            Unittest.createServiceTicket(TicketStatus.OK, 2012192)
-        );
-        Assert.assertNotNull(consumerRoles);
-
-        Assert.assertEquals(
-            "{\n" +
-            "  \"/group/system/system_on/abc/role/impersonator/\": [\n" +
-            "    {\n" +
-            "      \"scope\": \"/\"\n" +
-            "    }\n" +
-            "  ]\n" +
-            "}",
-            consumerRoles.debugPrint()
-        );
-        Assert.assertFalse(consumerRoles.hasRole("kek"));
-        Assert.assertTrue(consumerRoles.hasRole("/group/system/system_on/abc/role/impersonator/"));
-
-        Assert.assertNull(consumerRoles.getEntitiesForRole("kek"));
-        Assert.assertEquals(
-            new ArrayList<HashMap<String, String>>(Arrays.asList(
-                new HashMap<String, String>() {{
-                    put("scope", "/");
-                }}
-            )),
-            consumerRoles.getEntitiesForRole("/group/system/system_on/abc/role/impersonator/")
-        );
-    }
-}
diff --git a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/roles/RolesParserTest.java b/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/roles/RolesParserTest.java
deleted file mode 100644
index dd9f79776b8..00000000000
--- a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/roles/RolesParserTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package ru.yandex.passport.tvmauth.roles;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class RolesParserTest {
-    @Test(expected = java.lang.IllegalStateException.class)
-    public void malformedJsonTest() {
-        RolesParser.parse("kek");
-    }
-
-    @Test(expected = java.lang.NullPointerException.class)
-    public void emptyJsonTest() {
-        RolesParser.parse("{}");
-    }
-
-    @Test
-    public void malformedMetaRolesTest() {
-        RolesParser.parse("{\"revision\": 42, \"born_date\": 1612791978}");
-    }
-
-    @Test
-    public void noRolesTest() {
-        String raw = "{\"revision\": \"GYYDEMJUGBQWC\", \"born_date\": 1612791978}";
-        Roles roles = RolesParser.parse(raw);
-        Assert.assertEquals(raw, roles.getRaw());
-    }
-
-    @Test
-    public void noRolesWithKeysTest() {
-        String raw = "{\"revision\": \"GYYDEMJUGBQWC\",\"born_date\": 1612791978,\"tvm\": {},\"user\": {}}";
-        Roles roles = RolesParser.parse(raw);
-        Assert.assertEquals(raw, roles.getRaw());
-    }
-
-    @Test(expected = NumberFormatException.class)
-    public void malformedTvmidTest() {
-        String raw = "{\"revision\": \"GYYDEMJUGBQWC\",\"born_date\": 1612791978,\"tvm\": {\"1120000000000493\":{}}}";
-        Roles roles = RolesParser.parse(raw);
-        Assert.assertEquals(raw, roles.getRaw());
-    }
-
-    @Test(expected = NumberFormatException.class)
-    public void malformedUidTest() {
-        String raw = "{\"revision\": \"GYYDEMJUGBQWC\",\"born_date\": 1612791978,\"user\": {\"asd\":{}}}";
-        Roles roles = RolesParser.parse(raw);
-        Assert.assertEquals(raw, roles.getRaw());
-    }
-
-    @Test
-    public void commonTest() {
-        String raw = "{\"revision\":\"GYYDEMJUGBQWC\",\"born_date\":1612791978," +
-            "\"tvm\":{\"2012192\":{\"/group/system/system_on/abc/role/impersonator/\":[{\"scope\":\"/\"}]}}," +
-            "\"user\":{\"1120000000000493\":{\"/group/system/system_on/abc/role/roles_manage/\":[]}}}";
-        Roles roles = RolesParser.parse(raw);
-        Assert.assertEquals(raw, roles.getRaw());
-    }
-}
diff --git a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/roles/RolesTest.java b/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/roles/RolesTest.java
deleted file mode 100644
index 981b9c956af..00000000000
--- a/library/java/tvmauth/src/test/ru/yandex/passport/tvmauth/roles/RolesTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package ru.yandex.passport.tvmauth.roles;
-
-import java.util.Date;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import ru.yandex.passport.tvmauth.BlackboxEnv;
-import ru.yandex.passport.tvmauth.TicketStatus;
-import ru.yandex.passport.tvmauth.Unittest;
-import ru.yandex.passport.tvmauth.exception.NotAllowedException;
-
-public class RolesTest {
-    private String rawRoles = "{\"revision\":\"GYYDEMJUGBQWC\",\"born_date\":1612791978," +
-            "\"tvm\":{\"2012192\":{\"/group/system/system_on/abc/role/impersonator/\":[{\"scope\":\"/\"}]}}," +
-            "\"user\":{\"1120000000000493\":{\"/group/system/system_on/abc/role/roles_manage/\":[]}}}";
-
-    private Roles createRoles() {
-        return RolesParser.parse(rawRoles);
-    }
-
-    @Test
-    public void rawTest() {
-        Roles roles = createRoles();
-        Assert.assertEquals(rawRoles, roles.getRaw());
-    }
-
-    @Test
-    public void metaTest() {
-        Meta meta = createRoles().getMeta();
-        Assert.assertEquals("GYYDEMJUGBQWC", meta.getRevision());
-        Assert.assertEquals(new Date(1612791978000L), meta.getBornTime());
-    }
-
-    @Test(expected = NotAllowedException.class)
-    public void checkInvalidServiceTest() {
-        Roles roles = createRoles();
-        roles.getRolesForService(
-            Unittest.createServiceTicket(TicketStatus.EXPIRED, 42)
-        );
-    }
-
-    @Test
-    public void checkServiceWithoutRolesTest() {
-        Roles roles = createRoles();
-        ConsumerRoles consumerRoles = roles.getRolesForService(
-            Unittest.createServiceTicket(TicketStatus.OK, 42)
-        );
-        Assert.assertNull(consumerRoles);
-    }
-
-    @Test
-    public void checkServiceWithRolesTest() {
-        Roles roles = createRoles();
-        ConsumerRoles consumerRoles = roles.getRolesForService(
-            Unittest.createServiceTicket(TicketStatus.OK, 2012192)
-        );
-        Assert.assertNotNull(consumerRoles);
-        Assert.assertEquals(
-            "{\n" +
-            "  \"/group/system/system_on/abc/role/impersonator/\": [\n" +
-            "    {\n" +
-            "      \"scope\": \"/\"\n" +
-            "    }\n" +
-            "  ]\n" +
-            "}",
-            consumerRoles.debugPrint()
-        );
-    }
-
-    @Test(expected = NotAllowedException.class)
-    public void checkInvalidUserTest() {
-        Roles roles = createRoles();
-        roles.getRolesForUser(
-            Unittest.createUserTicket(TicketStatus.EXPIRED, 42, new String[]{}, new long[]{})
-        );
-    }
-
-    @Test(expected = NotAllowedException.class)
-    public void checkUserFromWrongEnvTest() {
-        Roles roles = createRoles();
-        roles.getRolesForUser(
-            Unittest.createUserTicket(TicketStatus.OK, 42, new String[]{}, new long[]{}, BlackboxEnv.PROD)
-        );
-    }
-
-    @Test
-    public void checkUserWithoutRolesTest() {
-        Roles roles = createRoles();
-        ConsumerRoles consumerRoles = roles.getRolesForUser(
-            Unittest.createUserTicket(TicketStatus.OK, 42, new String[]{}, new long[]{}, BlackboxEnv.PROD_YATEAM)
-        );
-        Assert.assertNull(consumerRoles);
-    }
-
-    @Test
-    public void checkUserWithRolesTest() {
-        Roles roles = createRoles();
-        ConsumerRoles consumerRoles = roles.getRolesForUser(
-            Unittest.createUserTicket(
-                TicketStatus.OK, 1120000000000493L, new String[]{}, new long[]{}, BlackboxEnv.PROD_YATEAM)
-        );
-        Assert.assertNotNull(consumerRoles);
-        Assert.assertEquals(
-            "{\n" +
-            "  \"/group/system/system_on/abc/role/roles_manage/\": []\n" +
-            "}",
-            consumerRoles.debugPrint()
-        );
-    }
-
-    @Test
-    public void checkSelectedUserWithRolesTest() {
-        Roles roles = createRoles();
-        ConsumerRoles consumerRoles = roles.getRolesForUser(
-            Unittest.createUserTicket(
-                TicketStatus.OK, 42, new String[]{}, new long[]{1120000000000493L}, BlackboxEnv.PROD_YATEAM),
-                1120000000000493L
-        );
-        Assert.assertNotNull(consumerRoles);
-        Assert.assertEquals(
-            "{\n" +
-            "  \"/group/system/system_on/abc/role/roles_manage/\": []\n" +
-            "}",
-            consumerRoles.debugPrint()
-        );
-    }
-
-    @Test
-    public void checkServiceRoleTest() {
-        Roles roles = createRoles();
-
-        Assert.assertFalse(roles.checkServiceRole(
-            Unittest.createServiceTicket(TicketStatus.OK, 42),
-            "/group/system/system_on/abc/role/impersonator/"
-        ));
-        Assert.assertFalse(roles.checkServiceRole(
-            Unittest.createServiceTicket(TicketStatus.OK, 2012192),
-            "kek"
-        ));
-
-        Assert.assertTrue(roles.checkServiceRole(
-            Unittest.createServiceTicket(TicketStatus.OK, 2012192),
-            "/group/system/system_on/abc/role/impersonator/"
-        ));
-    }
-
-    @Test
-    public void checkUserRoleTest() {
-        Roles roles = createRoles();
-
-        Assert.assertFalse(roles.checkUserRole(
-            Unittest.createUserTicket(
-                TicketStatus.OK, 42, new String[]{}, new long[]{}, BlackboxEnv.PROD_YATEAM),
-            "/group/system/system_on/abc/role/roles_manage/"
-        ));
-        Assert.assertFalse(roles.checkUserRole(
-            Unittest.createUserTicket(
-                TicketStatus.OK, 1120000000000493L, new String[]{}, new long[]{}, BlackboxEnv.PROD_YATEAM),
-            "kek"
-        ));
-
-        Assert.assertTrue(roles.checkUserRole(
-            Unittest.createUserTicket(
-                TicketStatus.OK, 1120000000000493L, new String[]{}, new long[]{}, BlackboxEnv.PROD_YATEAM),
-            "/group/system/system_on/abc/role/roles_manage/"
-        ));
-
-        Assert.assertFalse(roles.checkUserRole(
-            Unittest.createUserTicket(
-                TicketStatus.OK, 1120000000000493L, new String[]{}, new long[]{42}, BlackboxEnv.PROD_YATEAM),
-            "/group/system/system_on/abc/role/roles_manage/",
-            42
-        ));
-        Assert.assertTrue(roles.checkUserRole(
-            Unittest.createUserTicket(
-                TicketStatus.OK, 42, new String[]{}, new long[]{1120000000000493L}, BlackboxEnv.PROD_YATEAM),
-            "/group/system/system_on/abc/role/roles_manage/",
-            1120000000000493L
-        ));
-    }
-}
diff --git a/library/java/tvmauth/src/ut/roles/mapping.yaml b/library/java/tvmauth/src/ut/roles/mapping.yaml
deleted file mode 100644
index d2fcaead593..00000000000
--- a/library/java/tvmauth/src/ut/roles/mapping.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-slugs:
-  some_slug_2:
-    tvmid:
-      - 1000502
-      - 1000503
diff --git a/library/java/tvmauth/src/ut/roles/some_slug_2.json b/library/java/tvmauth/src/ut/roles/some_slug_2.json
deleted file mode 100644
index 84d85fae197..00000000000
--- a/library/java/tvmauth/src/ut/roles/some_slug_2.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "revision": "some_revision_2",
-    "born_date": 1642160002,
-    "tvm": {
-        "1000000001": {
-            "/role/service/read/": [{}],
-            "/role/service/write/": [{
-                "foo": "bar",
-                "kek": "lol"
-            }]
-        }
-    },
-    "user": {
-        "1120000000000001": {
-            "/role/user/write/": [{}],
-            "/role/user/read/": [{
-                "foo": "bar",
-                "kek": "lol"
-            }]
-        }
-    }
-}
diff --git a/library/java/tvmauth/src/ut/simplelogger.properties b/library/java/tvmauth/src/ut/simplelogger.properties
deleted file mode 100644
index 753a1c0bf8b..00000000000
--- a/library/java/tvmauth/src/ut/simplelogger.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-org.slf4j.simpleLogger.logFile=common.log
-org.slf4j.simpleLogger.defaultLogLevel=debug
-org.slf4j.simpleLogger.showThreadName=false
-org.slf4j.simpleLogger.showLogName=false
diff --git a/library/java/tvmauth/src/ut/tvmtool.cfg b/library/java/tvmauth/src/ut/tvmtool.cfg
deleted file mode 100644
index dbb8fcd4583..00000000000
--- a/library/java/tvmauth/src/ut/tvmtool.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "BbEnvType": 2,
-    "clients": {
-        "me": {
-            "secret": "fake_secret",
-            "self_tvm_id": 1000502,
-            "roles_for_idm_slug": "some_slug_2"
-        }
-    }
-}