diff --git a/docs/WalletGuide.md b/docs/WalletGuide.md
index 9ca33798..49e9a89f 100644
--- a/docs/WalletGuide.md
+++ b/docs/WalletGuide.md
@@ -128,6 +128,7 @@ Once the Wallet is configured, you can use the following:
 
 <!--- INCLUDE .*account.*
 import org.stellar.sdk.responses.operations.OperationResponse
+import org.stellar.sdk.responses.AccountResponse
 import org.stellar.walletsdk.*
 -->
 <!--- SUFFIX .*account.*
@@ -150,7 +151,7 @@ val accountKeyPair = account.createKeyPair()
 Get account information from the Stellar network (assets, liquidity pools, and reserved native balance).
 
 ```kotlin
-suspend fun getAccountInfo(): AccountInfo {
+suspend fun getAccountInfo(): AccountResponse {
   return account.getInfo(accountKeyPair.address)
 }
 ```
@@ -158,7 +159,7 @@ suspend fun getAccountInfo(): AccountInfo {
 Get account history (all operations) from the Stellar network.
 
 ```kotlin
-suspend fun getAccountHistory(): List<WalletOperation<OperationResponse>> {
+suspend fun getAccountHistory(): List<OperationResponse> {
   return account.getHistory(accountKeyPair.address)
 }
 ```
diff --git a/examples/documentation/src/example-account-01.kt b/examples/documentation/src/example-account-01.kt
index 90abfc46..9448bdf8 100644
--- a/examples/documentation/src/example-account-01.kt
+++ b/examples/documentation/src/example-account-01.kt
@@ -2,6 +2,7 @@
 package org.stellar.example.exampleAccount01
 
 import org.stellar.sdk.responses.operations.OperationResponse
+import org.stellar.sdk.responses.AccountResponse
 import org.stellar.walletsdk.*
 
 val wallet = Wallet(StellarConfiguration.Testnet)
@@ -9,11 +10,11 @@ val wallet = Wallet(StellarConfiguration.Testnet)
 val account = wallet.stellar().account()
 val accountKeyPair = account.createKeyPair()
 
-suspend fun getAccountInfo(): AccountInfo {
+suspend fun getAccountInfo(): AccountResponse {
   return account.getInfo(accountKeyPair.address)
 }
 
-suspend fun getAccountHistory(): List<WalletOperation<OperationResponse>> {
+suspend fun getAccountHistory(): List<OperationResponse> {
   return account.getHistory(accountKeyPair.address)
 }
 suspend fun main() {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a3112876..66783095 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 coroutines = "1.6.4"
 google-gson = "2.8.9"
 hoplite = "2.7.0"
-java-stellar-sdk = "0.40.0"
+java-stellar-sdk = "0.41.0"
 dokka = "1.6.10"
 kotlin = "1.8.20"
 kotlinx-json = "1.5.0"
diff --git a/wallet-sdk/build.gradle.kts b/wallet-sdk/build.gradle.kts
index d945ac4c..f43bf791 100644
--- a/wallet-sdk/build.gradle.kts
+++ b/wallet-sdk/build.gradle.kts
@@ -26,7 +26,7 @@ configurations {
 
 dependencies {
   api(libs.coroutines.core)
-  api(libs.java.stellar.sdk)
+  api(variantOf(libs.java.stellar.sdk) { classifier("uber") })
   api(libs.kotlin.datetime)
   api(libs.bundles.ktor.client)
   implementation(libs.kotlin.serialization.json)
diff --git a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/Constant.kt b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/Constant.kt
index aae2f0c9..fe899294 100644
--- a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/Constant.kt
+++ b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/Constant.kt
@@ -3,17 +3,6 @@ package org.stellar.walletsdk
 const val BASE_RESERVE_MIN_COUNT = 2
 const val BASE_RESERVE = 0.5
 
-val XLM_ASSET_DEFAULT =
-  NativeAssetDefault(
-    id = "XLM:native",
-    homeDomain = "Native",
-    name = "XLM",
-    // TODO: add XLM image
-    imageUrl = null,
-    assetCode = "XLM",
-    assetIssuer = "Native",
-  )
-
 const val XLM_PRECISION = 1e7
 const val DECIMAL_POINT_PRECISION = 7
 const val STRING_TRIM_LENGTH = 8
diff --git a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/Data.kt b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/Data.kt
index d139deb4..e1df9a32 100644
--- a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/Data.kt
+++ b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/Data.kt
@@ -2,15 +2,6 @@ package org.stellar.walletsdk
 
 import kotlinx.serialization.Serializable
 import org.stellar.sdk.requests.RequestBuilder
-import org.stellar.walletsdk.asset.AssetId
-
-@Deprecated("Formatted classes are to be removed")
-data class AccountInfo(
-  val publicKey: String,
-  val assets: List<FormattedAsset>,
-  val liquidityPools: List<FormattedLiquidityPool>,
-  val reservedNativeBalance: String,
-)
 
 /**
  * Account weights threshold
@@ -21,52 +12,6 @@ data class AccountInfo(
  */
 data class AccountThreshold(val low: Int, val medium: Int, val high: Int)
 
-@Deprecated("Formatted classes are to be removed")
-enum class AssetType(val type: String) {
-  NATIVE("native"),
-  ALPHANUM_4("credit_alphanum4"),
-  ALPHANUM_12("credit_alphanum12"),
-  LIQUIDITY_POOL("liquidity_pool_shares")
-}
-
-@Deprecated("Formatted classes are to be removed")
-data class CachedAsset(
-  val id: String,
-  val homeDomain: String?,
-  val name: String?,
-  val imageUrl: String?,
-  val amount: String?
-)
-
-@Deprecated("Formatted classes are to be removed")
-data class FormattedAsset(
-  val id: String,
-  val homeDomain: String?,
-  val name: String?,
-  val imageUrl: String?,
-  val assetCode: String,
-  val assetIssuer: String,
-  val balance: String,
-  val availableBalance: String,
-  val buyingLiabilities: String,
-  val sellingLiabilities: String
-)
-
-@Deprecated("Formatted classes are to be removed")
-data class FormattedBalances(
-  val assets: MutableList<FormattedAsset>,
-  val liquidityPools: MutableList<FormattedLiquidityPool>
-)
-
-@Deprecated("Formatted classes are to be removed")
-data class FormattedLiquidityPool(
-  val id: String,
-  val balance: String,
-  val totalTrustlines: Long,
-  val totalShares: String,
-  val reserves: List<LiquidityPoolReserve>
-)
-
 @Serializable
 data class InteractiveFlowResponse(
   val id: String,
@@ -78,56 +23,3 @@ enum class Order(internal val builderEnum: RequestBuilder.Order) {
   ASC(RequestBuilder.Order.ASC),
   DESC(RequestBuilder.Order.DESC)
 }
-
-@Deprecated("Formatted classes are to be removed")
-data class LiquidityPoolInfo(
-  val totalTrustlines: Long,
-  val totalShares: String,
-  val reserves: MutableList<LiquidityPoolReserve>
-)
-
-@Deprecated("Formatted classes are to be removed")
-data class LiquidityPoolReserve(
-  val id: String,
-  val assetCode: String,
-  val assetIssuer: String,
-  val homeDomain: String?,
-  val name: String?,
-  val imageUrl: String?,
-  val amount: String,
-)
-
-@Deprecated("Formatted classes are to be removed")
-data class NativeAssetDefault(
-  val id: String,
-  val homeDomain: String?,
-  val name: String?,
-  val imageUrl: String?,
-  val assetCode: String,
-  val assetIssuer: String,
-)
-
-@Deprecated(
-  "Formatted classes are to be removed. Use rawOperation instead",
-  replaceWith = ReplaceWith("this.rawOperation")
-)
-data class WalletOperation<T>(
-  val id: String,
-  val date: String,
-  val amount: String,
-  val account: String,
-  val asset: List<AssetId>,
-  val type: WalletOperationType,
-  val rawOperation: T,
-)
-
-@Deprecated("Formatted classes are to be removed")
-enum class WalletOperationType {
-  SEND,
-  RECEIVE,
-  DEPOSIT,
-  WITHDRAW,
-  SWAP,
-  OTHER,
-  ERROR
-}
diff --git a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/Wallet.kt b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/Wallet.kt
index 8c35f8e9..211d0baa 100644
--- a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/Wallet.kt
+++ b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/Wallet.kt
@@ -10,6 +10,7 @@ import io.ktor.serialization.kotlinx.json.*
 import io.ktor.utils.io.core.*
 import java.time.Duration
 import java.util.*
+import okhttp3.OkHttpClient
 import org.stellar.sdk.Network
 import org.stellar.sdk.Server
 import org.stellar.walletsdk.anchor.Anchor
@@ -19,7 +20,6 @@ import org.stellar.walletsdk.json.defaultJson
 import org.stellar.walletsdk.recovery.Recovery
 import org.stellar.walletsdk.recovery.RecoveryServer
 import org.stellar.walletsdk.recovery.RecoveryServerKey
-import shadow.okhttp3.OkHttpClient
 
 /**
  * Wallet SDK main entry point. It provides methods to build wallet applications on the Stellar
@@ -92,7 +92,7 @@ data class StellarConfiguration(
    * [Default base fee]
    * (https://developers.stellar.org/docs/encyclopedia/fees-surge-pricing-fee-strategies#network-fees-on-stellar)
    */
-  val baseFee: UInt = 100u,
+  val baseFee: ULong = 100u,
   val defaultTimeout: Duration = Duration.ofMinutes(3),
   val horizonClient: OkHttpClient? = null,
   val submitClient: OkHttpClient? = null
diff --git a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/extension/Server.kt b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/extension/Server.kt
index a811baab..1675b209 100644
--- a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/extension/Server.kt
+++ b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/extension/Server.kt
@@ -1,15 +1,12 @@
 package org.stellar.walletsdk.extension
 
-import org.stellar.sdk.LiquidityPoolID
 import org.stellar.sdk.Server
 import org.stellar.sdk.requests.ErrorResponse
 import org.stellar.sdk.responses.AccountResponse
-import org.stellar.sdk.responses.LiquidityPoolResponse
 import org.stellar.sdk.responses.operations.OperationResponse
 import org.stellar.walletsdk.*
 import org.stellar.walletsdk.exception.HorizonRequestFailedException
 import org.stellar.walletsdk.exception.OperationsLimitExceededException
-import org.stellar.walletsdk.util.formatAmount
 
 @Suppress("TooGenericExceptionCaught", "RethrowCaughtException")
 private fun <T> safeHorizonCall(body: () -> T): T {
@@ -45,68 +42,6 @@ suspend fun Server.accountOrNull(accountAddress: String): AccountResponse? {
   }
 }
 
-/**
- * Fetch liquidity pool information from the Stellar network.
- *
- * @param liquidityPoolId Liquidity pool ID
- * @param cachedAssetInfo Previously cached asset information to use for liquidity pool assets
- * @return liquidity pool data object
- * @throws [HorizonRequestFailedException] for Horizon exceptions
- */
-@Deprecated("Formatted classes are to be removed")
-suspend fun Server.liquidityPoolInfo(
-  liquidityPoolId: LiquidityPoolID,
-  cachedAssetInfo: MutableMap<String, CachedAsset>
-): LiquidityPoolInfo {
-  val response: LiquidityPoolResponse = safeHorizonCall {
-    liquidityPools().liquidityPool(liquidityPoolId)
-  }
-
-  val responseReserves = response.reserves
-  val totalTrustlines = response.totalTrustlines
-  val totalShares = response.totalShares
-
-  val reserves: MutableList<LiquidityPoolReserve> = mutableListOf()
-
-  responseReserves.forEach { item ->
-    if (item.asset.type == AssetType.NATIVE.type) {
-      val nativeReserve =
-        LiquidityPoolReserve(
-          id = XLM_ASSET_DEFAULT.id,
-          homeDomain = XLM_ASSET_DEFAULT.homeDomain,
-          name = XLM_ASSET_DEFAULT.name,
-          imageUrl = XLM_ASSET_DEFAULT.imageUrl,
-          assetCode = XLM_ASSET_DEFAULT.assetCode,
-          assetIssuer = XLM_ASSET_DEFAULT.assetIssuer,
-          amount = formatAmount(item.amount),
-        )
-
-      reserves.add(nativeReserve)
-    } else {
-      val assetArr = item.asset.toString().split(":")
-      val assetCode = assetArr[0]
-      val assetIssuer = assetArr[1]
-
-      val cachedItem = cachedAssetInfo[item.asset.toString()]
-      // TODO: if there is no cached info, fetch toml file to get homeDomain, name, and imageURL
-      val lpAsset =
-        LiquidityPoolReserve(
-          id = item.asset.toString(),
-          assetCode = assetCode,
-          assetIssuer = assetIssuer,
-          homeDomain = cachedItem?.homeDomain,
-          name = cachedItem?.name,
-          imageUrl = cachedItem?.imageUrl,
-          amount = formatAmount(item.amount),
-        )
-
-      reserves.add(lpAsset)
-    }
-  }
-
-  return LiquidityPoolInfo(totalTrustlines, totalShares, reserves)
-}
-
 /**
  * Fetch account operations from Stellar network.
  *
diff --git a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/AccountService.kt b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/AccountService.kt
index 84a9ee82..3047cbb9 100644
--- a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/AccountService.kt
+++ b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/AccountService.kt
@@ -2,6 +2,7 @@ package org.stellar.walletsdk.horizon
 
 import mu.KotlinLogging
 import org.stellar.sdk.*
+import org.stellar.sdk.responses.AccountResponse
 import org.stellar.sdk.responses.operations.OperationResponse
 import org.stellar.walletsdk.*
 import org.stellar.walletsdk.exception.*
@@ -41,20 +42,8 @@ internal constructor(
    * @return formatted account information
    * @throws [HorizonRequestFailedException] for Horizon exceptions
    */
-  suspend fun getInfo(accountAddress: String, serverInstance: Server = server): AccountInfo {
-    val account = serverInstance.accountByAddress(accountAddress)
-    val balances = formatAccountBalances(account, serverInstance)
-
-    log.debug { "Account info: accountAddress = $accountAddress" }
-
-    // TODO: add accountDetails
-
-    return AccountInfo(
-      publicKey = account.accountId,
-      assets = balances.assets,
-      liquidityPools = balances.liquidityPools,
-      reservedNativeBalance = account.reservedBalance()
-    )
+  suspend fun getInfo(accountAddress: String, serverInstance: Server = server): AccountResponse {
+    return serverInstance.accountByAddress(accountAddress)
   }
 
   /**
@@ -75,14 +64,12 @@ internal constructor(
     order: Order? = Order.DESC,
     cursor: String? = null,
     includeFailed: Boolean? = null
-  ): List<WalletOperation<OperationResponse>> {
+  ): List<OperationResponse> {
     log.debug {
       "Account history: accountAddress = $accountAddress, limit = $limit, order" +
         " = $order, cursor = $cursor, includeFailed = $includeFailed"
     }
 
-    return server.accountOperations(accountAddress, limit, order, cursor, includeFailed).map {
-      formatStellarOperation(accountAddress, it)
-    }
+    return server.accountOperations(accountAddress, limit, order, cursor, includeFailed)
   }
 }
diff --git a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/Stellar.kt b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/Stellar.kt
index a603e5f8..2e63607e 100644
--- a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/Stellar.kt
+++ b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/Stellar.kt
@@ -41,7 +41,7 @@ internal constructor(
    */
   suspend fun transaction(
     sourceAddress: AccountKeyPair,
-    baseFee: UInt? = null,
+    baseFee: ULong? = null,
     memo: Pair<MemoType, String>? = null,
     timeBounds: TimeBounds? = null
   ): TransactionBuilder {
@@ -66,7 +66,7 @@ internal constructor(
   suspend fun transaction(
     sourceAddress: AccountKeyPair,
     timeout: Duration,
-    baseFee: UInt? = null,
+    baseFee: ULong? = null,
     memo: Pair<MemoType, String>? = null,
   ): TransactionBuilder {
     return transaction(sourceAddress, baseFee, memo, timeout.toTimeBounds())
@@ -85,7 +85,7 @@ internal constructor(
   fun makeFeeBump(
     feeAddress: AccountKeyPair,
     transaction: Transaction,
-    baseFee: UInt? = null
+    baseFee: ULong? = null
   ): FeeBumpTransaction {
     return FeeBumpTransaction.Builder(transaction)
       .setBaseFee((baseFee ?: cfg.stellar.baseFee).toLong())
@@ -163,9 +163,9 @@ internal constructor(
   suspend fun submitWithFeeIncrease(
     sourceAccount: SigningKeyPair,
     timeout: Duration,
-    baseFeeIncrease: UInt,
-    baseFee: UInt? = null,
-    maxFee: UInt = Integer.MAX_VALUE.toUInt(),
+    baseFeeIncrease: ULong,
+    baseFee: ULong? = null,
+    maxFee: ULong = Integer.MAX_VALUE.toULong(),
     memo: Pair<MemoType, String>? = null,
     buildingFunction: TransactionBuilder.() -> TransactionBuilder
   ): Transaction {
@@ -201,9 +201,9 @@ internal constructor(
   suspend fun submitWithFeeIncrease(
     sourceAddress: AccountKeyPair,
     timeout: Duration,
-    baseFeeIncrease: UInt,
-    baseFee: UInt? = null,
-    maxFee: UInt = Integer.MAX_VALUE.toUInt(),
+    baseFeeIncrease: ULong,
+    baseFee: ULong? = null,
+    maxFee: ULong = Integer.MAX_VALUE.toULong(),
     memo: Pair<MemoType, String>? = null,
     signerFunction: Transaction.() -> Transaction,
     buildingFunction: TransactionBuilder.() -> TransactionBuilder
@@ -217,7 +217,7 @@ internal constructor(
       return transaction
     } catch (e: TransactionSubmitFailedException) {
       if (e.transactionResultCode == "tx_too_late") {
-        val newFee = min(maxFee, transaction.fee.toUInt() + baseFeeIncrease)
+        val newFee = min(maxFee, transaction.fee.toULong() + baseFeeIncrease)
         log.info {
           "Transaction ${transaction.hashHex()} has expired. Increasing fee to $newFee Stroops."
         }
diff --git a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/transaction/CommonTransactionBuilder.kt b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/transaction/CommonTransactionBuilder.kt
index 4ada9175..b1a7ec57 100644
--- a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/transaction/CommonTransactionBuilder.kt
+++ b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/transaction/CommonTransactionBuilder.kt
@@ -118,7 +118,7 @@ abstract class CommonTransactionBuilder<T>(protected val sourceAddress: String)
 
   protected fun doCreateAccount(
     newAccount: AccountKeyPair,
-    startingBalance: UInt,
+    startingBalance: ULong,
     sourceAddress: String
   ): CreateAccountOperation {
     log.debug {
diff --git a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/transaction/SponsoringBuilder.kt b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/transaction/SponsoringBuilder.kt
index ece3d6ca..22bc9bbe 100644
--- a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/transaction/SponsoringBuilder.kt
+++ b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/transaction/SponsoringBuilder.kt
@@ -20,7 +20,7 @@ internal constructor(
    * @param startingBalance optional Starting account balance in XLM. Default value is 0.
    * @throws [InvalidSponsoredAccountException]
    */
-  fun createAccount(newAccount: AccountKeyPair, startingBalance: UInt = 0u): SponsoringBuilder =
+  fun createAccount(newAccount: AccountKeyPair, startingBalance: ULong = 0u): SponsoringBuilder =
     building {
       doCreateAccount(newAccount, startingBalance, sponsorAccount.address)
     }
diff --git a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/transaction/TransactionBuilder.kt b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/transaction/TransactionBuilder.kt
index f8d74be2..ca7316d0 100644
--- a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/transaction/TransactionBuilder.kt
+++ b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/horizon/transaction/TransactionBuilder.kt
@@ -1,6 +1,7 @@
 package org.stellar.walletsdk.horizon.transaction
 
 import org.stellar.sdk.*
+import org.stellar.sdk.TransactionBuilder as SdkBuilder
 import org.stellar.sdk.responses.AccountResponse
 import org.stellar.walletsdk.*
 import org.stellar.walletsdk.anchor.MemoType
@@ -13,7 +14,6 @@ import org.stellar.walletsdk.extension.*
 import org.stellar.walletsdk.horizon.AccountKeyPair
 import org.stellar.walletsdk.horizon.Stellar
 import org.stellar.walletsdk.util.*
-import org.stellar.sdk.TransactionBuilder as SdkBuilder
 
 /** Class that allows to construct Stellar transactions, containing one or more operations */
 @Suppress("TooManyFunctions")
@@ -21,17 +21,17 @@ class TransactionBuilder
 internal constructor(
   cfg: Config,
   sourceAccount: AccountResponse,
-  baseFee: UInt?,
+  baseFee: ULong?,
   memo: Pair<MemoType, String>?,
   timeBounds: TimeBounds?
 ) : CommonTransactionBuilder<TransactionBuilder>(sourceAccount.accountId) {
   private val network: Network = cfg.stellar.network
-  private val maxBaseFeeInStroops: Int = cfg.stellar.baseFee.toInt()
+  private val maxBaseFeeInStroops: Long = cfg.stellar.baseFee.toLong()
   override val operations: MutableList<Operation> = mutableListOf()
 
   private val builder: SdkBuilder =
     SdkBuilder(sourceAccount, network)
-      .setBaseFee(baseFee?.toInt() ?: maxBaseFeeInStroops)
+      .setBaseFee(baseFee?.toLong() ?: maxBaseFeeInStroops)
       .addPreconditions(
         TransactionPreconditions.builder()
           .timeBounds(timeBounds ?: cfg.stellar.defaultTimeout.toTimeBounds())
@@ -81,7 +81,7 @@ internal constructor(
    * accounts is 1 XLM. Default value is 1.
    * @throws [InvalidStartingBalanceException] on invalid starting balance
    */
-  fun createAccount(newAccount: AccountKeyPair, startingBalance: UInt = 1u) = building {
+  fun createAccount(newAccount: AccountKeyPair, startingBalance: ULong = 1u) = building {
     if (startingBalance < 1u) {
       throw InvalidStartingBalanceException
     }
diff --git a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/toml/Data.kt b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/toml/Data.kt
index 142ab425..95dc3c52 100644
--- a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/toml/Data.kt
+++ b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/toml/Data.kt
@@ -1,12 +1,12 @@
 package org.stellar.walletsdk.toml
 
+import com.google.gson.annotations.SerializedName
 import io.ktor.http.*
 import org.stellar.sdk.Network
 import org.stellar.walletsdk.asset.IssuedAssetId
 import org.stellar.walletsdk.asset.NativeAssetId
 import org.stellar.walletsdk.asset.StellarAssetId
 import org.stellar.walletsdk.exception.ValidationException
-import shadow.com.google.gson.annotations.SerializedName
 
 data class TomlInfo(
   @SerializedName("VERSION") val version: String?,
diff --git a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/toml/StellarToml.kt b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/toml/StellarToml.kt
index d62c362c..2518c5bb 100644
--- a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/toml/StellarToml.kt
+++ b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/toml/StellarToml.kt
@@ -1,10 +1,10 @@
 package org.stellar.walletsdk.toml
 
+import com.moandjiezana.toml.Toml
 import io.ktor.client.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
-import shadow.com.moandjiezana.toml.Toml
 
 /**
  * [Stellar info file](https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0001.md)
diff --git a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/util/Format.kt b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/util/Format.kt
index ea0ba883..1decb8db 100644
--- a/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/util/Format.kt
+++ b/wallet-sdk/src/main/kotlin/org/stellar/walletsdk/util/Format.kt
@@ -3,265 +3,8 @@
 package org.stellar.walletsdk.util
 
 import java.math.BigDecimal
-import org.stellar.sdk.Server
-import org.stellar.sdk.responses.AccountResponse
-import org.stellar.sdk.responses.operations.CreateAccountOperationResponse
-import org.stellar.sdk.responses.operations.OperationResponse
-import org.stellar.sdk.responses.operations.PathPaymentBaseOperationResponse
-import org.stellar.sdk.responses.operations.PaymentOperationResponse
 import org.stellar.walletsdk.*
 import org.stellar.walletsdk.anchor.*
-import org.stellar.walletsdk.asset.AssetId
-import org.stellar.walletsdk.asset.NativeAssetId
-import org.stellar.walletsdk.asset.toAssetId
-import org.stellar.walletsdk.extension.liquidityPoolInfo
-import org.stellar.walletsdk.extension.reservedBalance
-
-/**
- * Format account's balances (assets and liquidity pools).
- *
- * @param account Account response object whose balances to format
- * @param server Horizon [Server] instance
- * @return formatted account balances
- */
-@Suppress("LongMethod")
-@Deprecated("Formatted classes are to be removed")
-suspend fun formatAccountBalances(account: AccountResponse, server: Server): FormattedBalances {
-  val cachedAssetTomlInfo = mutableMapOf<String, CachedAsset>()
-
-  // Caching asset info fetched from toml files to avoid multiple calls for the same asset
-  fun maybeAddToCachedAssetTomlInfo(assetInfo: List<CachedAsset>) {
-    assetInfo.forEach { asset ->
-      if (asset.id != XLM_ASSET_DEFAULT.id && cachedAssetTomlInfo[asset.id] == null) {
-        cachedAssetTomlInfo[asset.id] = asset
-      }
-    }
-  }
-
-  val result = FormattedBalances(assets = mutableListOf(), liquidityPools = mutableListOf())
-
-  account.balances.forEach { balance ->
-    when {
-      // Native (XLM asset)
-      balance.assetType == AssetType.NATIVE.type -> {
-        val reservedBalance = BigDecimal(account.reservedBalance())
-        val nativeAsset =
-          FormattedAsset(
-            id = XLM_ASSET_DEFAULT.id,
-            homeDomain = XLM_ASSET_DEFAULT.homeDomain,
-            name = XLM_ASSET_DEFAULT.name,
-            imageUrl = XLM_ASSET_DEFAULT.imageUrl,
-            assetCode = XLM_ASSET_DEFAULT.assetCode,
-            assetIssuer = XLM_ASSET_DEFAULT.assetIssuer,
-            balance = formatAmount(balance.balance),
-            availableBalance =
-              formatAmount(BigDecimal(balance.balance).minus(reservedBalance).toString()),
-            buyingLiabilities = formatAmount(balance.buyingLiabilities.toString()),
-            sellingLiabilities = formatAmount(balance.sellingLiabilities.toString())
-          )
-
-        result.assets.add(nativeAsset)
-      }
-      // Non-native asset
-      (balance.assetType == AssetType.ALPHANUM_4.type ||
-        balance.assetType == AssetType.ALPHANUM_12.type) -> {
-        val asset =
-          FormattedAsset(
-            id = "${balance.assetCode}:${balance.assetIssuer}",
-            // TODO: fetch home domain
-            homeDomain = "",
-            // TODO: fetch name
-            name = "",
-            // TODO: fetch imageUrl
-            imageUrl = "",
-            assetCode = balance.assetCode.toString(),
-            assetIssuer = balance.assetIssuer.toString(),
-            balance = formatAmount(balance.balance),
-            availableBalance = formatAmount(balance.balance),
-            buyingLiabilities = formatAmount(balance.buyingLiabilities.toString()),
-            sellingLiabilities = formatAmount(balance.sellingLiabilities.toString())
-          )
-
-        result.assets.add(asset)
-
-        maybeAddToCachedAssetTomlInfo(
-          listOf(
-            CachedAsset(
-              id = asset.id,
-              homeDomain = asset.homeDomain,
-              name = asset.name,
-              imageUrl = asset.imageUrl,
-              amount = formatAmount(asset.balance)
-            )
-          )
-        )
-      }
-      // Liquidity pool
-      balance.assetType == AssetType.LIQUIDITY_POOL.type -> {
-        val liquidityPoolInfo =
-          server.liquidityPoolInfo(
-            liquidityPoolId = balance.liquidityPoolID.get(),
-            cachedAssetInfo = cachedAssetTomlInfo,
-          )
-
-        val lpAsset =
-          FormattedLiquidityPool(
-            id = balance.asset.toString(),
-            balance = formatAmount(balance.balance),
-            totalTrustlines = liquidityPoolInfo.totalTrustlines,
-            totalShares = liquidityPoolInfo.totalShares,
-            reserves = liquidityPoolInfo.reserves
-          )
-
-        result.liquidityPools.add(lpAsset)
-
-        maybeAddToCachedAssetTomlInfo(
-          liquidityPoolInfo.reserves.map {
-            CachedAsset(
-              id = it.id,
-              homeDomain = it.homeDomain,
-              name = it.name,
-              imageUrl = it.imageUrl,
-              amount = it.amount
-            )
-          }
-        )
-      }
-    }
-  }
-
-  return result
-}
-
-/**
- * Format Stellar account operations to make them consistent.
- *
- * @param accountAddress Stellar address of the account
- * @param operation Stellar operation to format
- * @return formatted operation
- */
-@Suppress("ReturnCount")
-@Deprecated("Formatted classes are to be removed")
-fun formatStellarOperation(
-  accountAddress: String,
-  operation: OperationResponse
-): WalletOperation<OperationResponse> {
-  val opBuilder = WalletOperationBuilder<OperationResponse>().fromOperation(operation)
-
-  when (operation) {
-    // Create account
-    is CreateAccountOperationResponse -> {
-      val isCreator = operation.funder == accountAddress
-
-      return opBuilder
-        .amount(operation.startingBalance)
-        .account(if (isCreator) operation.account else operation.funder)
-        .asset(listOf(NativeAssetId))
-        .type(if (isCreator) WalletOperationType.SEND else WalletOperationType.RECEIVE)
-        .build()
-    }
-    // Payment
-    is PaymentOperationResponse -> {
-      // TODO: This version of Java SDK currently doesn't have "to" and "from" muxed account for
-      // payment
-      val isSender = operation.from == accountAddress
-
-      return opBuilder
-        .amount(operation.amount)
-        .account(if (isSender) operation.to else operation.from)
-        .asset(listOf(operation.asset.toAssetId()))
-        .type(if (isSender) WalletOperationType.SEND else WalletOperationType.RECEIVE)
-        .build()
-    }
-    // Path payment and swap
-    is PathPaymentBaseOperationResponse -> {
-      // TODO: check muxed account
-      val isSender = operation.from == accountAddress
-      val isSwap = isSender && operation.from == operation.to
-
-      return opBuilder
-        .amount(operation.amount)
-        .account(
-          if (isSender) {
-            if (isSwap) {
-              ""
-            } else {
-              operation.to
-            }
-          } else {
-            operation.from
-          }
-        )
-        .asset(listOf(operation.sourceAsset.toAssetId(), operation.asset.toAssetId()))
-        .type(
-          if (isSender) {
-            if (isSwap) {
-              WalletOperationType.SWAP
-            } else {
-              WalletOperationType.SEND
-            }
-          } else {
-            WalletOperationType.RECEIVE
-          }
-        )
-        .build()
-    }
-    // Other
-    else -> {
-      return opBuilder.build()
-    }
-  }
-}
-
-/**
- * Helper class to format wallet operation from Stellar operation or anchor transaction.
- *
- * @param T type of operation or transaction
- */
-@Deprecated("Formatted classes are to be removed")
-internal class WalletOperationBuilder<T : Any> {
-  lateinit var id: String
-  lateinit var date: String
-  lateinit var amount: String
-  lateinit var account: String
-  lateinit var asset: List<AssetId>
-  lateinit var type: WalletOperationType
-  lateinit var rawOperation: T
-
-  internal fun defaults() = apply {
-    this.amount = ""
-    this.account = ""
-    this.type = WalletOperationType.OTHER
-  }
-
-  fun id(id: String) = apply { this.id = id }
-  fun date(date: String) = apply { this.date = date }
-  fun amount(amount: String) = apply { this.amount = amount }
-  fun account(account: String) = apply { this.account = account }
-  fun asset(asset: List<AssetId>) = apply { this.asset = asset }
-  fun type(type: WalletOperationType) = apply { this.type = type }
-  fun rawOperation(rawOperation: T) = apply { this.rawOperation = rawOperation }
-
-  fun build(): WalletOperation<T> {
-    return WalletOperation(
-      id = this.id,
-      date = this.date,
-      amount = this.amount,
-      account = this.account,
-      asset = this.asset,
-      type = this.type,
-      rawOperation = this.rawOperation as T
-    )
-  }
-}
-
-internal fun <T : OperationResponse> WalletOperationBuilder<T>.fromOperation(operation: T) = apply {
-  this.defaults()
-  this.id = operation.id.toString()
-  this.date = operation.createdAt
-  this.asset = listOf()
-  this.rawOperation = operation
-}
 
 /**
  * Format amount to consistent string.
diff --git a/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/SubmitTransactionTest.kt b/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/SubmitTransactionTest.kt
index d9c6b151..aed5356e 100644
--- a/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/SubmitTransactionTest.kt
+++ b/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/SubmitTransactionTest.kt
@@ -103,8 +103,8 @@ internal class SubmitTransactionTest {
       }
 
     val newKeyPair = wallet.stellar().account().createKeyPair()
-    val baseFee = 123U
-    val feeIncrease = 100U
+    val baseFee = 123UL
+    val feeIncrease = 100UL
     val expectedFee = (baseFee + feeIncrease * 2u).toLong()
 
     val transaction = assertDoesNotThrow {
diff --git a/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/account/GetInfoTest.kt b/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/account/GetInfoTest.kt
deleted file mode 100644
index 28e1debc..00000000
--- a/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/account/GetInfoTest.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.stellar.walletsdk.account
-
-import io.mockk.every
-import io.mockk.spyk
-import kotlin.test.assertEquals
-import kotlinx.coroutines.runBlocking
-import org.junit.jupiter.api.Test
-import org.stellar.sdk.Server
-import org.stellar.sdk.responses.AccountResponse
-import org.stellar.walletsdk.ADDRESS_BASIC
-import org.stellar.walletsdk.ADDRESS_FULL
-import org.stellar.walletsdk.HORIZON_URL
-import org.stellar.walletsdk.TestWallet
-import org.stellar.walletsdk.helpers.stellarObjectFromJsonFile
-
-internal class GetInfoTest {
-  private val server = spyk(Server(HORIZON_URL))
-  private val wallet = TestWallet.also { it.cfg.stellar.server = server }
-  private val accounts = wallet.stellar().account()
-
-  @Test
-  fun `basic account info`() {
-    val accountResponse = stellarObjectFromJsonFile<AccountResponse>("account_basic.json")
-
-    every { server.accounts().account(ADDRESS_BASIC) } returns accountResponse
-
-    val accountInfo = runBlocking { accounts.getInfo(ADDRESS_BASIC, server) }
-
-    assertEquals(ADDRESS_BASIC, accountInfo.publicKey)
-    assertEquals("1.0000000", accountInfo.reservedNativeBalance)
-    assertEquals(1, accountInfo.assets.size)
-    assertEquals(0, accountInfo.liquidityPools.size)
-  }
-
-  @Test
-  fun `full account info`() {
-    val accountResponse = stellarObjectFromJsonFile<AccountResponse>("account_full.json")
-
-    every { server.accounts().account(ADDRESS_FULL) } returns accountResponse
-
-    val accountInfo = runBlocking { accounts.getInfo(ADDRESS_FULL, server) }
-
-    assertEquals(ADDRESS_FULL, accountInfo.publicKey)
-    assertEquals("6.5000000", accountInfo.reservedNativeBalance)
-    assertEquals(4, accountInfo.assets.size)
-    assertEquals(0, accountInfo.liquidityPools.size)
-  }
-}
diff --git a/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/helpers/MapFromTomlFile.kt b/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/helpers/MapFromTomlFile.kt
index 44b9f37e..4e43afc8 100644
--- a/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/helpers/MapFromTomlFile.kt
+++ b/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/helpers/MapFromTomlFile.kt
@@ -1,7 +1,7 @@
 package org.stellar.walletsdk.helpers
 
+import com.moandjiezana.toml.Toml
 import java.io.FileReader
-import shadow.com.moandjiezana.toml.Toml
 
 fun mapFromTomlFile(fileName: String): Map<String, Any> {
   val filePath = getFileFromResource(fileName)
diff --git a/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/util/FormatStellarOperationTest.kt b/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/util/FormatStellarOperationTest.kt
deleted file mode 100644
index 4a661636..00000000
--- a/wallet-sdk/src/test/kotlin/org/stellar/walletsdk/util/FormatStellarOperationTest.kt
+++ /dev/null
@@ -1,297 +0,0 @@
-package org.stellar.walletsdk.util
-
-import kotlin.test.assertEquals
-import org.junit.jupiter.api.Test
-import org.stellar.sdk.responses.operations.*
-import org.stellar.walletsdk.WalletOperationType
-import org.stellar.walletsdk.asset.StellarAssetId
-import org.stellar.walletsdk.helpers.stellarObjectFromJsonFile
-
-data class StellarOperationsJson(
-  val createAccount: CreateAccountOperationResponse,
-  val paymentNative: PaymentOperationResponse,
-  val paymentAsset: PaymentOperationResponse,
-  val pathPaymentStrictReceive: PathPaymentStrictReceiveOperationResponse,
-  val pathPaymentStrictReceiveSwap: PathPaymentStrictReceiveOperationResponse,
-  val pathPaymentStrictSend: PathPaymentStrictSendOperationResponse,
-  val pathPaymentStrictSendSwap: PathPaymentStrictSendOperationResponse,
-  val changeTrust: ChangeTrustOperationResponse,
-  val claimClaimableBalance: ClaimClaimableBalanceOperationResponse
-)
-
-internal class FormatStellarOperationTest {
-  private val stellarOperations =
-    stellarObjectFromJsonFile<StellarOperationsJson>("stellar_operations.json")
-
-  @Test
-  fun `create account for account creator`() {
-    val operation =
-      formatStellarOperation(
-        "GAMQTINWD3YPP3GLTQZ4M6FKCCSRGROQLIIRVECIFC6VEGL5F64CND22",
-        stellarOperations.createAccount
-      )
-
-    assertEquals(operation.id, "34832184791041")
-    assertEquals(operation.date, "2022-09-14T21:19:29Z")
-    assertEquals(operation.amount, "10000.0000000")
-    assertEquals(operation.account, "GAIH3ULLFQ4DGSECF2AR555KZ4KNDGEKN4AFI4SU2M7B43MGK3QJZNSR")
-    assertEquals(operation.asset[0].id, "native")
-    assertEquals(operation.type, WalletOperationType.SEND)
-  }
-
-  @Test
-  fun `create account for created account`() {
-    val operation =
-      formatStellarOperation(
-        "GAIH3ULLFQ4DGSECF2AR555KZ4KNDGEKN4AFI4SU2M7B43MGK3QJZNSR",
-        stellarOperations.createAccount
-      )
-
-    assertEquals(operation.id, "34832184791041")
-    assertEquals(operation.date, "2022-09-14T21:19:29Z")
-    assertEquals(operation.amount, "10000.0000000")
-    assertEquals(operation.account, "GAMQTINWD3YPP3GLTQZ4M6FKCCSRGROQLIIRVECIFC6VEGL5F64CND22")
-    assertEquals(operation.asset[0].id, "native")
-    assertEquals(operation.type, WalletOperationType.RECEIVE)
-  }
-
-  @Test
-  fun `native payment for sender`() {
-    val operation =
-      formatStellarOperation(
-        "GAKEBVZB3RQO5GOFMLKATWKIQ2Z7SAPBG6E3LY7MELNRREYFV43MG7FQ",
-        stellarOperations.paymentNative
-      )
-
-    assertEquals(operation.id, "163322432148766721")
-    assertEquals(operation.date, "2021-10-28T18:35:53Z")
-    assertEquals(operation.amount, "0.0100000")
-    assertEquals(operation.account, "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42")
-    assertEquals(operation.asset[0].id, "native")
-    assertEquals(operation.type, WalletOperationType.SEND)
-  }
-
-  @Test
-  fun `native payment for receiver`() {
-    val operation =
-      formatStellarOperation(
-        "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-        stellarOperations.paymentNative
-      )
-
-    assertEquals(operation.id, "163322432148766721")
-    assertEquals(operation.date, "2021-10-28T18:35:53Z")
-    assertEquals(operation.amount, "0.0100000")
-    assertEquals(operation.account, "GAKEBVZB3RQO5GOFMLKATWKIQ2Z7SAPBG6E3LY7MELNRREYFV43MG7FQ")
-    assertEquals(operation.asset[0].id, "native")
-    assertEquals(operation.type, WalletOperationType.RECEIVE)
-  }
-
-  @Test
-  fun `asset payment for sender`() {
-    val operation =
-      formatStellarOperation(
-        "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-        stellarOperations.paymentAsset
-      )
-
-    assertEquals(operation.id, "163328062850232321")
-    assertEquals(operation.date, "2021-10-28T20:42:42Z")
-    assertEquals(operation.amount, "10.0000000")
-    assertEquals(operation.account, "GAKEBVZB3RQO5GOFMLKATWKIQ2Z7SAPBG6E3LY7MELNRREYFV43MG7FQ")
-    assertEquals(
-      operation.asset[0].id,
-      "QUIET:GAXE7IP22GTI4H373KDVVSXZTPM4GMRDUKSXM4MFZMYYRB4HYQHLJCBO"
-    )
-    assertEquals(operation.type, WalletOperationType.SEND)
-  }
-
-  @Test
-  fun `asset payment for receiver`() {
-    val operation =
-      formatStellarOperation(
-        "GAKEBVZB3RQO5GOFMLKATWKIQ2Z7SAPBG6E3LY7MELNRREYFV43MG7FQ",
-        stellarOperations.paymentAsset
-      )
-
-    assertEquals(operation.id, "163328062850232321")
-    assertEquals(operation.date, "2021-10-28T20:42:42Z")
-    assertEquals(operation.amount, "10.0000000")
-    assertEquals(operation.account, "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42")
-    assertEquals(
-      operation.asset[0].id,
-      "QUIET:GAXE7IP22GTI4H373KDVVSXZTPM4GMRDUKSXM4MFZMYYRB4HYQHLJCBO"
-    )
-    assertEquals(operation.type, WalletOperationType.RECEIVE)
-  }
-
-  @Test
-  fun `path payment strict receive for sender`() {
-    val operation =
-      formatStellarOperation(
-        "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-        stellarOperations.pathPaymentStrictReceive
-      )
-
-    assertEquals(operation.id, "124018825644490753")
-    assertEquals(operation.date, "2020-03-26T19:33:55Z")
-    assertEquals(operation.amount, "0.1000000")
-    assertEquals(operation.account, "GBZH7S5NC57XNHKHJ75C5DGMI3SP6ZFJLIKW74K6OSMA5E5DFMYBDD2Z")
-    assertEquals(
-      operation.asset[0].id,
-      "USD:GDUKMGUGDZQK6YHYA5Z6AY2G4XDSZPSZ3SW5UN3ARVMO6QSRDWP5YLEX"
-    )
-    assertEquals(
-      operation.asset[1].id,
-      "BRL:GDVKY2GU2DRXWTBEYJJWSFXIGBZV6AZNBVVSUHEPZI54LIS6BA7DVVSP"
-    )
-    assertEquals(operation.type, WalletOperationType.SEND)
-  }
-
-  @Test
-  fun `path payment strict receive for receiver`() {
-    val operation =
-      formatStellarOperation(
-        "GBZH7S5NC57XNHKHJ75C5DGMI3SP6ZFJLIKW74K6OSMA5E5DFMYBDD2Z",
-        stellarOperations.pathPaymentStrictReceive
-      )
-
-    assertEquals(operation.id, "124018825644490753")
-    assertEquals(operation.date, "2020-03-26T19:33:55Z")
-    assertEquals(operation.amount, "0.1000000")
-    assertEquals(operation.account, "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42")
-    assertEquals(
-      operation.asset[0].id,
-      "USD:GDUKMGUGDZQK6YHYA5Z6AY2G4XDSZPSZ3SW5UN3ARVMO6QSRDWP5YLEX"
-    )
-    assertEquals(
-      operation.asset[1].id,
-      "BRL:GDVKY2GU2DRXWTBEYJJWSFXIGBZV6AZNBVVSUHEPZI54LIS6BA7DVVSP"
-    )
-    assertEquals(operation.type, WalletOperationType.RECEIVE)
-  }
-
-  @Test
-  fun `path payment strict receive swap`() {
-    val operation =
-      formatStellarOperation(
-        "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-        stellarOperations.pathPaymentStrictReceiveSwap
-      )
-
-    assertEquals(operation.id, "124018825644490753")
-    assertEquals(operation.date, "2020-03-26T19:33:55Z")
-    assertEquals(operation.amount, "0.1000000")
-    assertEquals(operation.account, "")
-    assertEquals(
-      operation.asset[0].id,
-      "USD:GDUKMGUGDZQK6YHYA5Z6AY2G4XDSZPSZ3SW5UN3ARVMO6QSRDWP5YLEX"
-    )
-    assertEquals(
-      operation.asset[1].id,
-      "BRL:GDVKY2GU2DRXWTBEYJJWSFXIGBZV6AZNBVVSUHEPZI54LIS6BA7DVVSP"
-    )
-    assertEquals(operation.type, WalletOperationType.SWAP)
-  }
-
-  @Test
-  fun `path payment strict send for sender`() {
-    val operation =
-      formatStellarOperation(
-        "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-        stellarOperations.pathPaymentStrictSend
-      )
-
-    assertEquals(operation.id, "124624072438579201")
-    assertEquals(operation.date, "2020-04-04T13:47:50Z")
-    assertEquals(operation.amount, "26.5544244")
-    assertEquals(operation.account, "GBZH7S5NC57XNHKHJ75C5DGMI3SP6ZFJLIKW74K6OSMA5E5DFMYBDD2Z")
-    assertEquals(
-      operation.asset[0].id,
-      "USD:GDUKMGUGDZQK6YHYA5Z6AY2G4XDSZPSZ3SW5UN3ARVMO6QSRDWP5YLEX"
-    )
-    assertEquals(
-      operation.asset[1].id,
-      "BRL:GDVKY2GU2DRXWTBEYJJWSFXIGBZV6AZNBVVSUHEPZI54LIS6BA7DVVSP"
-    )
-    assertEquals(operation.type, WalletOperationType.SEND)
-  }
-
-  @Test
-  fun `path payment strict send for receiver`() {
-    val operation =
-      formatStellarOperation(
-        "GBZH7S5NC57XNHKHJ75C5DGMI3SP6ZFJLIKW74K6OSMA5E5DFMYBDD2Z",
-        stellarOperations.pathPaymentStrictSend
-      )
-
-    assertEquals(operation.id, "124624072438579201")
-    assertEquals(operation.date, "2020-04-04T13:47:50Z")
-    assertEquals(operation.amount, "26.5544244")
-    assertEquals(operation.account, "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42")
-    assertEquals(
-      operation.asset[0].id,
-      "USD:GDUKMGUGDZQK6YHYA5Z6AY2G4XDSZPSZ3SW5UN3ARVMO6QSRDWP5YLEX"
-    )
-    assertEquals(
-      operation.asset[1].id,
-      "BRL:GDVKY2GU2DRXWTBEYJJWSFXIGBZV6AZNBVVSUHEPZI54LIS6BA7DVVSP"
-    )
-    assertEquals(operation.type, WalletOperationType.RECEIVE)
-  }
-
-  @Test
-  fun `path payment strict send for swap`() {
-    val operation =
-      formatStellarOperation(
-        "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-        stellarOperations.pathPaymentStrictSendSwap
-      )
-
-    assertEquals(operation.id, "124624072438579201")
-    assertEquals(operation.date, "2020-04-04T13:47:50Z")
-    assertEquals(operation.amount, "26.5544244")
-    assertEquals(operation.account, "")
-    assertEquals(
-      operation.asset[0].id,
-      "USD:GDUKMGUGDZQK6YHYA5Z6AY2G4XDSZPSZ3SW5UN3ARVMO6QSRDWP5YLEX"
-    )
-    assertEquals(
-      operation.asset[1].id,
-      "BRL:GDVKY2GU2DRXWTBEYJJWSFXIGBZV6AZNBVVSUHEPZI54LIS6BA7DVVSP"
-    )
-    assertEquals(operation.type, WalletOperationType.SWAP)
-  }
-
-  @Test
-  fun `change trust should be formatted as other`() {
-    val operation =
-      formatStellarOperation(
-        "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-        stellarOperations.changeTrust
-      )
-
-    assertEquals(operation.id, "163325782222753793")
-    assertEquals(operation.date, "2021-10-28T19:50:44Z")
-    assertEquals(operation.amount, "")
-    assertEquals(operation.account, "")
-    assertEquals(operation.asset, listOf<StellarAssetId>())
-    assertEquals(operation.type, WalletOperationType.OTHER)
-  }
-
-  @Test
-  fun `claim claimable balance should be formatted as other`() {
-    val operation =
-      formatStellarOperation(
-        "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-        stellarOperations.claimClaimableBalance
-      )
-
-    assertEquals(operation.id, "163325782222753794")
-    assertEquals(operation.date, "2021-10-29T10:51:44Z")
-    assertEquals(operation.amount, "")
-    assertEquals(operation.account, "")
-    assertEquals(operation.asset, listOf<StellarAssetId>())
-    assertEquals(operation.type, WalletOperationType.OTHER)
-  }
-}
diff --git a/wallet-sdk/src/test/resources/account_basic.json b/wallet-sdk/src/test/resources/account_basic.json
index bdbb4782..a77055ed 100644
--- a/wallet-sdk/src/test/resources/account_basic.json
+++ b/wallet-sdk/src/test/resources/account_basic.json
@@ -33,9 +33,9 @@
     }
   },
   "id": "GAFRGFVBQHOLZBTDF75FHLECSJB547NFUGZZ4WG756FALNUYITK7R4JB",
-  "accountId": "GAFRGFVBQHOLZBTDF75FHLECSJB547NFUGZZ4WG756FALNUYITK7R4JB",
+  "account_id": "GAFRGFVBQHOLZBTDF75FHLECSJB547NFUGZZ4WG756FALNUYITK7R4JB",
   "sequence": "4382782197334016",
-  "subentryCount": 0,
+  "subentry_count": 0,
   "lastModifiedLedger": 1020446,
   "lastModifiedTime": "2022-08-23T15:08:27Z",
   "thresholds": {
@@ -52,9 +52,9 @@
   "balances": [
     {
       "balance": "1.0000000",
-      "buyingLiabilities": "0.0000000",
-      "sellingLiabilities": "0.0000000",
-      "assetType": "native"
+      "buying_liabilities": "0.0000000",
+      "selling_liabilities": "0.0000000",
+      "asset_type": "native"
     }
   ],
   "signers": [
@@ -65,7 +65,7 @@
     }
   ],
   "data": {},
-  "numSponsoring": 0,
-  "numSponsored": 0,
+  "num_sponsoring": 0,
+  "num_sponsored": 0,
   "pagingToken": "GAFRGFVBQHOLZBTDF75FHLECSJB547NFUGZZ4WG756FALNUYITK7R4JB"
 }
\ No newline at end of file
diff --git a/wallet-sdk/src/test/resources/account_full.json b/wallet-sdk/src/test/resources/account_full.json
index 6a819383..217e3a57 100644
--- a/wallet-sdk/src/test/resources/account_full.json
+++ b/wallet-sdk/src/test/resources/account_full.json
@@ -37,7 +37,7 @@
   "sequence": "132007890016796828",
   "sequenceLedger": 41440097,
   "sequenceTime": "1655930056",
-  "subentryCount": 6,
+  "subentry_count": 6,
   "homeDomain": "test.org",
   "lastModifiedLedger": 41440097,
   "lastModifiedTime": "2022-06-22T20:34:16Z",
@@ -56,45 +56,45 @@
     {
       "balance": "10.5417798",
       "limit": "922337203685.4775807",
-      "buyingLiabilities": "0.0000000",
-      "sellingLiabilities": "0.0000000",
+      "buying_liabilities": "0.0000000",
+      "selling_liabilities": "0.0000000",
       "lastModifiedLedger": 40368577,
       "isAuthorized": true,
       "isAuthorizedToMaintainLiabilities": true,
-      "assetType": "credit_alphanum4",
-      "assetCode": "AQUA",
-      "assetIssuer": "GAV273QGEOQBPUL7USV3OOAZST2ER6AJNBDOYCLMK7DGWC73UJIOO4OQ"
+      "asset_type": "credit_alphanum4",
+      "asset_code": "AQUA",
+      "asset_issuer": "GAV273QGEOQBPUL7USV3OOAZST2ER6AJNBDOYCLMK7DGWC73UJIOO4OQ"
     },
     {
       "balance": "9.6700000",
       "limit": "922337203685.4775807",
-      "buyingLiabilities": "0.0000000",
-      "sellingLiabilities": "4.0000000",
+      "buying_liabilities": "0.0000000",
+      "selling_liabilities": "4.0000000",
       "lastModifiedLedger": 40160057,
       "isAuthorized": true,
       "isAuthorizedToMaintainLiabilities": true,
       "isClawbackEnabled": true,
-      "assetType": "credit_alphanum12",
-      "assetCode": "QUIET",
-      "assetIssuer": "GC4IZLJT3FEYA43JSSVELAMT2QUQMC3XARWDGFDB7FWBWW6MOD3LNPLV"
+      "asset_type": "credit_alphanum12",
+      "asset_code": "QUIET",
+      "asset_issuer": "GC4IZLJT3FEYA43JSSVELAMT2QUQMC3XARWDGFDB7FWBWW6MOD3LNPLV"
     },
     {
       "balance": "0.9701371",
       "limit": "922337203685.4775807",
-      "buyingLiabilities": "0.0000000",
-      "sellingLiabilities": "0.0000000",
+      "buying_liabilities": "0.0000000",
+      "selling_liabilities": "0.0000000",
       "lastModifiedLedger": 41440072,
       "isAuthorized": true,
       "isAuthorizedToMaintainLiabilities": true,
-      "assetType": "credit_alphanum4",
-      "assetCode": "USDC",
-      "assetIssuer": "GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      "asset_type": "credit_alphanum4",
+      "asset_code": "USDC",
+      "asset_issuer": "GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
     },
     {
       "balance": "42.8598684",
-      "buyingLiabilities": "0.0000000",
-      "sellingLiabilities": "2.0000000",
-      "assetType": "native"
+      "buying_liabilities": "0.0000000",
+      "selling_liabilities": "2.0000000",
+      "asset_type": "native"
     }
   ],
   "signers": [
@@ -108,7 +108,7 @@
     "anotherKey": "cXdlcnR5",
     "someKey": "c29tZVZhbHVl"
   },
-  "numSponsoring": 1,
-  "numSponsored": 0,
+  "num_sponsoring": 1,
+  "num_sponsored": 0,
   "pagingToken": "GC5UMI2LAP4XF677VIN2EG7WRLPPPUHCE24JA6GTKETFT5IRJCTXJIFS"
 }
\ No newline at end of file
diff --git a/wallet-sdk/src/test/resources/expired_transaction.json b/wallet-sdk/src/test/resources/expired_transaction.json
index 2368052d..4e6a1e89 100644
--- a/wallet-sdk/src/test/resources/expired_transaction.json
+++ b/wallet-sdk/src/test/resources/expired_transaction.json
@@ -2,11 +2,11 @@
   "extras": {
     "envelope_xdr": "AAAAAgAAAAAyOhY6Xz6jgVflpUvtD8/57U+k/tgMnu6zhEC8EMHn8gAAAGQAABPBAAAAsAAAAAEAAAAAAAAAAAAAAABkghsTAAAAAAAAAAEAAAABAAAAADI6FjpfPqOBV+WlS+0Pz/ntT6T+2Aye7rOEQLwQwefyAAAAAAAAAAB3Dr2esPWxInsMccK18euqPgdYgV8quB30xAIwf5MHawAAAAAAmJaAAAAAAAAAAAA\u003d",
     "result_xdr": "AAAAAAAAAGT////9AAAAAA\u003d\u003d",
-    "resultCodes": {
-      "transactionResultCode": "tx_too_late"
+    "result_codes": {
+      "transaction": "tx_too_late"
     }
   },
-  "rateLimitLimit": 0,
-  "rateLimitRemaining": 0,
-  "rateLimitReset": 0
+  "rate_limit_limit": 0,
+  "rate_limit_remaining": 0,
+  "rate_limit_reset": 0
 }
\ No newline at end of file
diff --git a/wallet-sdk/src/test/resources/stellar_operations.json b/wallet-sdk/src/test/resources/stellar_operations.json
deleted file mode 100644
index b46627e2..00000000
--- a/wallet-sdk/src/test/resources/stellar_operations.json
+++ /dev/null
@@ -1,159 +0,0 @@
-{
-  "createAccount": {
-    "id": "34832184791041",
-    "pagingToken": "34832184791041",
-    "transactionSuccessful": true,
-    "sourceAccount": "GAIH3ULLFQ4DGSECF2AR555KZ4KNDGEKN4AFI4SU2M7B43MGK3QJZNSR",
-    "type": "create_account",
-    "typeI": 0,
-    "createdAt": "2022-09-14T21:19:29Z",
-    "transactionHash": "4f2ef062c815db3ac6c30476a8780781695dcf44a82df604823b09c6378eb3b7",
-    "startingBalance": "10000.0000000",
-    "funder": "GAMQTINWD3YPP3GLTQZ4M6FKCCSRGROQLIIRVECIFC6VEGL5F64CND22",
-    "account": "GAIH3ULLFQ4DGSECF2AR555KZ4KNDGEKN4AFI4SU2M7B43MGK3QJZNSR"
-  },
-  "paymentNative": {
-    "id": "163322432148766721",
-    "pagingToken": "163322432148766721",
-    "transactionSuccessful": true,
-    "sourceAccount": "GAKEBVZB3RQO5GOFMLKATWKIQ2Z7SAPBG6E3LY7MELNRREYFV43MG7FQ",
-    "type": "payment",
-    "typeI": 1,
-    "createdAt": "2021-10-28T18:35:53Z",
-    "transactionHash": "c5da871e5a13087d064894511b25ac816fe1dc9a9dcc4078b40c8dbf4aa978ed",
-    "assetType": "native",
-    "from": "GAKEBVZB3RQO5GOFMLKATWKIQ2Z7SAPBG6E3LY7MELNRREYFV43MG7FQ",
-    "to": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "toMuxed": "MCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKUAAAAAAAAAAEK67DU",
-    "toMuxedId": "1111",
-    "amount": "0.0100000"
-  },
-  "paymentAsset": {
-    "id": "163328062850232321",
-    "pagingToken": "163328062850232321",
-    "transactionSuccessful": true,
-    "sourceAccount": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "type": "payment",
-    "typeI": 1,
-    "createdAt": "2021-10-28T20:42:42Z",
-    "transactionHash": "38d5dcec391e8d286c68da6f1eff7fccb13628e1e13d108c6bdf8b0313df8c5e",
-    "assetType": "credit_alphanum12",
-    "assetCode": "QUIET",
-    "assetIssuer": "GAXE7IP22GTI4H373KDVVSXZTPM4GMRDUKSXM4MFZMYYRB4HYQHLJCBO",
-    "from": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "to": "GAKEBVZB3RQO5GOFMLKATWKIQ2Z7SAPBG6E3LY7MELNRREYFV43MG7FQ",
-    "amount": "10.0000000"
-  },
-  "pathPaymentStrictReceive": {
-    "id": "124018825644490753",
-    "pagingToken": "124018825644490753",
-    "transactionSuccessful": true,
-    "sourceAccount": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "type": "path_payment_strict_receive",
-    "typeI": 2,
-    "createdAt": "2020-03-26T19:33:55Z",
-    "transactionHash": "2624935eefedc195562623d982e501ba2a183382959fa0b9d03cf66dced3b332",
-    "assetType": "credit_alphanum4",
-    "assetCode": "BRL",
-    "assetIssuer": "GDVKY2GU2DRXWTBEYJJWSFXIGBZV6AZNBVVSUHEPZI54LIS6BA7DVVSP",
-    "from": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "to": "GBZH7S5NC57XNHKHJ75C5DGMI3SP6ZFJLIKW74K6OSMA5E5DFMYBDD2Z",
-    "amount": "0.1000000",
-    "sourceAmount": "0.0198773",
-    "sourceMax": "0.0198774",
-    "sourceAssetType": "credit_alphanum4",
-    "sourceAssetCode": "USD",
-    "sourceAssetIssuer": "GDUKMGUGDZQK6YHYA5Z6AY2G4XDSZPSZ3SW5UN3ARVMO6QSRDWP5YLEX"
-  },
-  "pathPaymentStrictReceiveSwap": {
-    "id": "124018825644490753",
-    "pagingToken": "124018825644490753",
-    "transactionSuccessful": true,
-    "sourceAccount": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "type": "path_payment_strict_receive",
-    "typeI": 2,
-    "createdAt": "2020-03-26T19:33:55Z",
-    "transactionHash": "2624935eefedc195562623d982e501ba2a183382959fa0b9d03cf66dced3b332",
-    "assetType": "credit_alphanum4",
-    "assetCode": "BRL",
-    "assetIssuer": "GDVKY2GU2DRXWTBEYJJWSFXIGBZV6AZNBVVSUHEPZI54LIS6BA7DVVSP",
-    "from": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "to": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "amount": "0.1000000",
-    "sourceAmount": "0.0198773",
-    "sourceMax": "0.0198774",
-    "sourceAssetType": "credit_alphanum4",
-    "sourceAssetCode": "USD",
-    "sourceAssetIssuer": "GDUKMGUGDZQK6YHYA5Z6AY2G4XDSZPSZ3SW5UN3ARVMO6QSRDWP5YLEX"
-  },
-  "pathPaymentStrictSend": {
-    "id": "124624072438579201",
-    "pagingToken": "124624072438579201",
-    "transactionSuccessful": true,
-    "sourceAccount": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "type": "path_payment_strict_send",
-    "typeI": 13,
-    "createdAt": "2020-04-04T13:47:50Z",
-    "transactionHash": "2b863994825fe85b80bfdff433b348d5ce80b23cd9ee2a56dcd6ee1abd52c9f8",
-    "assetType": "credit_alphanum4",
-    "assetCode": "BRL",
-    "assetIssuer": "GDVKY2GU2DRXWTBEYJJWSFXIGBZV6AZNBVVSUHEPZI54LIS6BA7DVVSP",
-    "from": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "to": "GBZH7S5NC57XNHKHJ75C5DGMI3SP6ZFJLIKW74K6OSMA5E5DFMYBDD2Z",
-    "amount": "26.5544244",
-    "sourceAmount": "5.0000000",
-    "destinationNin": "26.5544244",
-    "sourceAssetType": "credit_alphanum4",
-    "sourceAssetCode": "USD",
-    "sourceAssetIssuer": "GDUKMGUGDZQK6YHYA5Z6AY2G4XDSZPSZ3SW5UN3ARVMO6QSRDWP5YLEX"
-  },
-  "pathPaymentStrictSendSwap": {
-    "id": "124624072438579201",
-    "pagingToken": "124624072438579201",
-    "transactionSuccessful": true,
-    "sourceAccount": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "type": "path_payment_strict_send",
-    "typeI": 13,
-    "createdAt": "2020-04-04T13:47:50Z",
-    "transactionHash": "2b863994825fe85b80bfdff433b348d5ce80b23cd9ee2a56dcd6ee1abd52c9f8",
-    "assetType": "credit_alphanum4",
-    "assetCode": "BRL",
-    "assetIssuer": "GDVKY2GU2DRXWTBEYJJWSFXIGBZV6AZNBVVSUHEPZI54LIS6BA7DVVSP",
-    "from": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "to": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "amount": "26.5544244",
-    "sourceAmount": "5.0000000",
-    "destinationNin": "26.5544244",
-    "sourceAssetType": "credit_alphanum4",
-    "sourceAssetCode": "USD",
-    "sourceAssetIssuer": "GDUKMGUGDZQK6YHYA5Z6AY2G4XDSZPSZ3SW5UN3ARVMO6QSRDWP5YLEX"
-  },
-  "changeTrust": {
-    "id": "163325782222753793",
-    "pagingToken": "163325782222753793",
-    "transactionSuccessful": true,
-    "sourceAccount": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "type": "change_trust",
-    "typeI": 6,
-    "createdAt": "2021-10-28T19:50:44Z",
-    "transactionHash": "bd312352d59b33544022fbf4a157acd32aa193f7c80cbe274d5dd9e9f7d1747d",
-    "assetType": "credit_alphanum12",
-    "assetCode": "QUIET",
-    "assetIssuer": "GAXE7IP22GTI4H373KDVVSXZTPM4GMRDUKSXM4MFZMYYRB4HYQHLJCBO",
-    "limit": "922337203685.4775807",
-    "trustee": "GAXE7IP22GTI4H373KDVVSXZTPM4GMRDUKSXM4MFZMYYRB4HYQHLJCBO",
-    "trustor": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42"
-  },
-  "claimClaimableBalance": {
-    "id": "163325782222753794",
-    "pagingToken": "163325782222753794",
-    "transactionSuccessful": true,
-    "sourceAccount": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42",
-    "type": "claim_claimable_balance",
-    "typeI": 15,
-    "createdAt": "2021-10-29T10:51:44Z",
-    "transactionHash": "bd312352d59b33544022fbf4a157acd32aa193f7c80cbe274d5dd9e9f7d1747d",
-    "balanceId": "00000000a960fbac6897abb426a07e4281f603aa8844c1e77ebb300b30116321c38ac21c",
-    "claimant": "GCOK6S3AUTVOEBSTFFDRMMFBWVH7BIWC56U5HUW7OH5EF5YE75WKVL42"
-  }
-}
\ No newline at end of file