diff --git a/app/src/main/java/net/mynero/wallet/adapter/CoinsInfoAdapter.kt b/app/src/main/java/net/mynero/wallet/adapter/CoinsInfoAdapter.kt
index 134a66b..0b8499c 100644
--- a/app/src/main/java/net/mynero/wallet/adapter/CoinsInfoAdapter.kt
+++ b/app/src/main/java/net/mynero/wallet/adapter/CoinsInfoAdapter.kt
@@ -33,8 +33,6 @@ class CoinsInfoAdapter(val listener: CoinsInfoAdapterListener?) :
     RecyclerView.Adapter<CoinsInfoAdapter.ViewHolder>() {
     private var localDataSet // <public-key, coinsinfo>
             : List<CoinsInfo>
-
-    @JvmField
     val selectedUtxos // <public-key, coinsinfo>
             : HashMap<String?, CoinsInfo>
     private var editing = false
diff --git a/app/src/main/java/net/mynero/wallet/adapter/TransactionInfoAdapter.kt b/app/src/main/java/net/mynero/wallet/adapter/TransactionInfoAdapter.kt
index 03d9b09..3e9b90f 100644
--- a/app/src/main/java/net/mynero/wallet/adapter/TransactionInfoAdapter.kt
+++ b/app/src/main/java/net/mynero/wallet/adapter/TransactionInfoAdapter.kt
@@ -25,7 +25,7 @@ import net.mynero.wallet.R
 import net.mynero.wallet.model.TransactionInfo
 import net.mynero.wallet.service.PrefService
 import net.mynero.wallet.util.Constants
-import net.mynero.wallet.util.DateHelper.DATETIME_FORMATTER
+import net.mynero.wallet.util.DateHelper
 import net.mynero.wallet.util.Helper
 import net.mynero.wallet.util.ThemeHelper
 import java.util.Calendar
@@ -89,7 +89,7 @@ class TransactionInfoAdapter(val listener: TxInfoAdapterListener?) :
             failedColour = ThemeHelper.getThemedColor(view.context, R.attr.neutralColor)
             val cal = Calendar.getInstance()
             val tz = cal.timeZone //get the local time zone.
-            DATETIME_FORMATTER.timeZone = tz
+            DateHelper.DATETIME_FORMATTER.timeZone = tz
         }
 
         fun bind(txInfo: TransactionInfo) {
@@ -155,7 +155,7 @@ class TransactionInfoAdapter(val listener: TxInfoAdapterListener?) :
         }
 
         private fun getDateTime(time: Long): String {
-            return DATETIME_FORMATTER.format(Date(time * 1000))
+            return DateHelper.DATETIME_FORMATTER.format(Date(time * 1000))
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/mynero/wallet/data/Node.kt b/app/src/main/java/net/mynero/wallet/data/Node.kt
index 1383ebc..e22a93f 100644
--- a/app/src/main/java/net/mynero/wallet/data/Node.kt
+++ b/app/src/main/java/net/mynero/wallet/data/Node.kt
@@ -254,7 +254,6 @@ class Node {
             }
         }
 
-        @JvmStatic
         fun fromJson(jsonObject: JSONObject?): Node? {
             return try {
                 Node(jsonObject)
diff --git a/app/src/main/java/net/mynero/wallet/data/Subaddress.kt b/app/src/main/java/net/mynero/wallet/data/Subaddress.kt
index 90cbfa6..cdaed27 100644
--- a/app/src/main/java/net/mynero/wallet/data/Subaddress.kt
+++ b/app/src/main/java/net/mynero/wallet/data/Subaddress.kt
@@ -20,7 +20,7 @@ import java.util.regex.Pattern
 class Subaddress(
     private val accountIndex: Int,
     val addressIndex: Int,
-    @JvmField val address: String,
+    val address: String,
     val label: String
 ) : Comparable<Subaddress> {
     var amount: Long = 0
diff --git a/app/src/main/java/net/mynero/wallet/fragment/dialog/AddNodeBottomSheetDialog.kt b/app/src/main/java/net/mynero/wallet/fragment/dialog/AddNodeBottomSheetDialog.kt
index 3b929d9..3e21b73 100644
--- a/app/src/main/java/net/mynero/wallet/fragment/dialog/AddNodeBottomSheetDialog.kt
+++ b/app/src/main/java/net/mynero/wallet/fragment/dialog/AddNodeBottomSheetDialog.kt
@@ -21,7 +21,6 @@ import org.json.JSONException
 import org.json.JSONObject
 
 class AddNodeBottomSheetDialog : BottomSheetDialogFragment() {
-    @JvmField
     var listener: AddNodeListener? = null
     override fun onCreateView(
         inflater: LayoutInflater,
diff --git a/app/src/main/java/net/mynero/wallet/fragment/dialog/EditNodeBottomSheetDialog.kt b/app/src/main/java/net/mynero/wallet/fragment/dialog/EditNodeBottomSheetDialog.kt
index 86f2328..6d4b549 100644
--- a/app/src/main/java/net/mynero/wallet/fragment/dialog/EditNodeBottomSheetDialog.kt
+++ b/app/src/main/java/net/mynero/wallet/fragment/dialog/EditNodeBottomSheetDialog.kt
@@ -19,11 +19,9 @@ import org.json.JSONException
 import org.json.JSONObject
 
 class EditNodeBottomSheetDialog : BottomSheetDialogFragment() {
-    @JvmField
     var listener: EditNodeListener? = null
-
-    @JvmField
     var node: Node? = null
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
diff --git a/app/src/main/java/net/mynero/wallet/fragment/dialog/NodeSelectionBottomSheetDialog.kt b/app/src/main/java/net/mynero/wallet/fragment/dialog/NodeSelectionBottomSheetDialog.kt
index cf8747d..b217d30 100644
--- a/app/src/main/java/net/mynero/wallet/fragment/dialog/NodeSelectionBottomSheetDialog.kt
+++ b/app/src/main/java/net/mynero/wallet/fragment/dialog/NodeSelectionBottomSheetDialog.kt
@@ -25,7 +25,6 @@ import org.json.JSONException
 import org.json.JSONObject
 
 class NodeSelectionBottomSheetDialog : BottomSheetDialogFragment(), NodeSelectionAdapterListener {
-    @JvmField
     var listener: NodeSelectionDialogListener? = null
     private var adapter: NodeSelectionAdapter? = null
     override fun onCreateView(
diff --git a/app/src/main/java/net/mynero/wallet/fragment/dialog/PasswordBottomSheetDialog.kt b/app/src/main/java/net/mynero/wallet/fragment/dialog/PasswordBottomSheetDialog.kt
index dacb8e9..bf4f4b6 100644
--- a/app/src/main/java/net/mynero/wallet/fragment/dialog/PasswordBottomSheetDialog.kt
+++ b/app/src/main/java/net/mynero/wallet/fragment/dialog/PasswordBottomSheetDialog.kt
@@ -15,11 +15,9 @@ import net.mynero.wallet.util.Helper.getClipBoardText
 import java.io.File
 
 class PasswordBottomSheetDialog : BottomSheetDialogFragment() {
-    @JvmField
     var listener: PasswordListener? = null
+    var canCancel = false
 
-    @JvmField
-    var cancelable = false
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -30,7 +28,7 @@ class PasswordBottomSheetDialog : BottomSheetDialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        isCancelable = cancelable
+        isCancelable = canCancel
         val walletFile = File(activity?.applicationInfo?.dataDir, Constants.WALLET_NAME)
         val pastePasswordImageButton =
             view.findViewById<ImageButton>(R.id.paste_password_imagebutton)
diff --git a/app/src/main/java/net/mynero/wallet/fragment/dialog/SendBottomSheetDialog.kt b/app/src/main/java/net/mynero/wallet/fragment/dialog/SendBottomSheetDialog.kt
index bdd0ede..60f3895 100644
--- a/app/src/main/java/net/mynero/wallet/fragment/dialog/SendBottomSheetDialog.kt
+++ b/app/src/main/java/net/mynero/wallet/fragment/dialog/SendBottomSheetDialog.kt
@@ -38,13 +38,9 @@ import net.mynero.wallet.util.UriData.Companion.parse
 class SendBottomSheetDialog : BottomSheetDialogFragment() {
     private val _sendingMax = MutableLiveData(false)
     private val _pendingTransaction = MutableLiveData<PendingTransaction?>(null)
-
-    @JvmField
     var selectedUtxos = ArrayList<String>()
     private var sendingMax: LiveData<Boolean?> = _sendingMax
     private var pendingTransaction: LiveData<PendingTransaction?> = _pendingTransaction
-
-    @JvmField
     var uriData: UriData? = null
     private val cameraPermissionsLauncher = registerForActivityResult(
         ActivityResultContracts.RequestPermission()
@@ -57,10 +53,7 @@ class SendBottomSheetDialog : BottomSheetDialogFragment() {
         }
     }
 
-    @JvmField
     var isChurning = false
-
-    @JvmField
     var listener: Listener? = null
     var priority: PendingTransaction.Priority = PendingTransaction.Priority.Priority_Low
     private var addressEditText: EditText? = null
diff --git a/app/src/main/java/net/mynero/wallet/fragment/dialog/WalletKeysBottomSheetDialog.kt b/app/src/main/java/net/mynero/wallet/fragment/dialog/WalletKeysBottomSheetDialog.kt
index 0571aef..c6d7bb6 100644
--- a/app/src/main/java/net/mynero/wallet/fragment/dialog/WalletKeysBottomSheetDialog.kt
+++ b/app/src/main/java/net/mynero/wallet/fragment/dialog/WalletKeysBottomSheetDialog.kt
@@ -14,8 +14,8 @@ import net.mynero.wallet.util.Constants
 import net.mynero.wallet.util.Helper.clipBoardCopy
 
 class WalletKeysBottomSheetDialog : BottomSheetDialogFragment() {
-    @JvmField
     var password = ""
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
diff --git a/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.kt b/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.kt
index 3631cb9..a84fa9a 100644
--- a/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.kt
+++ b/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.kt
@@ -139,7 +139,7 @@ class SettingsFragment : Fragment(), PasswordListener, NodeSelectionDialogListen
             if (usesPassword) {
                 activity?.supportFragmentManager?.let { fragmentManager ->
                     val passwordDialog = PasswordBottomSheetDialog()
-                    passwordDialog.cancelable = true
+                    passwordDialog.canCancel = true
                     passwordDialog.listener = this
                     passwordDialog.show(fragmentManager, "password_dialog")
                 }
diff --git a/app/src/main/java/net/mynero/wallet/model/TransactionInfo.kt b/app/src/main/java/net/mynero/wallet/model/TransactionInfo.kt
index 0766f5d..5f33f7a 100644
--- a/app/src/main/java/net/mynero/wallet/model/TransactionInfo.kt
+++ b/app/src/main/java/net/mynero/wallet/model/TransactionInfo.kt
@@ -22,43 +22,22 @@ import android.os.Parcelable.Creator
 import net.mynero.wallet.data.Subaddress
 
 class TransactionInfo : Parcelable, Comparable<TransactionInfo> {
-    @JvmField
     var direction: Direction
     var isPending: Boolean
     var isFailed: Boolean
-
-    @JvmField
     var amount: Long
     var fee: Long
-
-    @JvmField
     var blockheight: Long
-
-    @JvmField
     var hash: String?
-
-    @JvmField
     var timestamp: Long
     var paymentId: String?
-
-    @JvmField
     var accountIndex: Int
-
-    @JvmField
     var addressIndex: Int
-
-    @JvmField
     var confirmations: Long
     var subaddressLabel: String?
-
-    @JvmField
     var transfers: List<Transfer>? = listOf()
-
-    @JvmField
     var txKey: String? = null
     var notes: String? = null
-
-    @JvmField
     var address: String? = null
 
     constructor(
diff --git a/app/src/main/java/net/mynero/wallet/model/Transfer.kt b/app/src/main/java/net/mynero/wallet/model/Transfer.kt
index 637a26c..e1f5f75 100644
--- a/app/src/main/java/net/mynero/wallet/model/Transfer.kt
+++ b/app/src/main/java/net/mynero/wallet/model/Transfer.kt
@@ -21,8 +21,6 @@ import android.os.Parcelable.Creator
 
 class Transfer : Parcelable {
     var amount: Long
-
-    @JvmField
     var address: String?
 
     constructor(amount: Long, address: String?) {
diff --git a/app/src/main/java/net/mynero/wallet/model/Wallet.kt b/app/src/main/java/net/mynero/wallet/model/Wallet.kt
index 958ec7c..3568de4 100644
--- a/app/src/main/java/net/mynero/wallet/model/Wallet.kt
+++ b/app/src/main/java/net/mynero/wallet/model/Wallet.kt
@@ -428,7 +428,7 @@ class Wallet {
         ConnectionStatus_Disconnected, ConnectionStatus_Connected, ConnectionStatus_WrongVersion
     }
 
-    class Status internal constructor(status: Int, @JvmField val errorString: String) {
+    class Status internal constructor(status: Int, val errorString: String) {
         val status: StatusEnum
         var connectionStatus: ConnectionStatus? = null // optional
 
diff --git a/app/src/main/java/net/mynero/wallet/model/WalletManager.kt b/app/src/main/java/net/mynero/wallet/model/WalletManager.kt
index 40e4630..60f495d 100644
--- a/app/src/main/java/net/mynero/wallet/model/WalletManager.kt
+++ b/app/src/main/java/net/mynero/wallet/model/WalletManager.kt
@@ -328,7 +328,6 @@ class WalletManager {
 
         // no need to keep a reference to the REAL WalletManager (we get it every tvTime we need it)
         @get:Synchronized
-        @JvmStatic
         var instance: WalletManager? = null
             get() {
                 if (field == null) {
diff --git a/app/src/main/java/net/mynero/wallet/service/AddressService.kt b/app/src/main/java/net/mynero/wallet/service/AddressService.kt
index 48339d6..dce70f1 100644
--- a/app/src/main/java/net/mynero/wallet/service/AddressService.kt
+++ b/app/src/main/java/net/mynero/wallet/service/AddressService.kt
@@ -33,7 +33,6 @@ class AddressService(thread: MoneroHandlerThread) : ServiceBase(thread) {
     }
 
     companion object {
-        @JvmField
         var instance: AddressService? = null
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/mynero/wallet/service/BalanceService.kt b/app/src/main/java/net/mynero/wallet/service/BalanceService.kt
index 034aca1..edba771 100644
--- a/app/src/main/java/net/mynero/wallet/service/BalanceService.kt
+++ b/app/src/main/java/net/mynero/wallet/service/BalanceService.kt
@@ -50,7 +50,6 @@ class BalanceService(thread: MoneroHandlerThread) : ServiceBase(thread) {
         get() = totalBalanceRaw - unlockedBalanceRaw
 
     companion object {
-        @JvmField
         var instance: BalanceService? = null
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/mynero/wallet/service/BlockchainService.kt b/app/src/main/java/net/mynero/wallet/service/BlockchainService.kt
index 8d8541d..7cbac3f 100644
--- a/app/src/main/java/net/mynero/wallet/service/BlockchainService.kt
+++ b/app/src/main/java/net/mynero/wallet/service/BlockchainService.kt
@@ -9,8 +9,6 @@ class BlockchainService(thread: MoneroHandlerThread) : ServiceBase(thread) {
     private val _currentHeight = MutableLiveData(0L)
     private val _connectionStatus = MutableLiveData(ConnectionStatus.ConnectionStatus_Disconnected)
     var height: LiveData<Long> = _currentHeight
-
-    @JvmField
     var connectionStatus: LiveData<ConnectionStatus> = _connectionStatus
     var daemonHeight: Long = 0
         set(height) {
@@ -43,7 +41,6 @@ class BlockchainService(thread: MoneroHandlerThread) : ServiceBase(thread) {
     }
 
     companion object {
-        @JvmField
         var instance: BlockchainService? = null
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/mynero/wallet/service/HistoryService.kt b/app/src/main/java/net/mynero/wallet/service/HistoryService.kt
index c7aa240..18b3d0c 100644
--- a/app/src/main/java/net/mynero/wallet/service/HistoryService.kt
+++ b/app/src/main/java/net/mynero/wallet/service/HistoryService.kt
@@ -7,8 +7,6 @@ import net.mynero.wallet.model.WalletManager
 
 class HistoryService(thread: MoneroHandlerThread) : ServiceBase(thread) {
     private val _history = MutableLiveData<List<TransactionInfo>>()
-
-    @JvmField
     var history: LiveData<List<TransactionInfo>> = _history
 
     init {
@@ -24,7 +22,6 @@ class HistoryService(thread: MoneroHandlerThread) : ServiceBase(thread) {
     }
 
     companion object {
-        @JvmStatic
         var instance: HistoryService? = null
             private set
     }
diff --git a/app/src/main/java/net/mynero/wallet/service/PrefService.kt b/app/src/main/java/net/mynero/wallet/service/PrefService.kt
index 1a7ff98..90bfdea 100644
--- a/app/src/main/java/net/mynero/wallet/service/PrefService.kt
+++ b/app/src/main/java/net/mynero/wallet/service/PrefService.kt
@@ -111,7 +111,6 @@ class PrefService(application: MoneroApplication) : ServiceBase(null) {
     companion object {
         private var preferences: SharedPreferences? = null
 
-        @JvmStatic
         var instance: PrefService? = null
             private set
     }
diff --git a/app/src/main/java/net/mynero/wallet/service/UTXOService.kt b/app/src/main/java/net/mynero/wallet/service/UTXOService.kt
index 2e038dc..1b77b94 100644
--- a/app/src/main/java/net/mynero/wallet/service/UTXOService.kt
+++ b/app/src/main/java/net/mynero/wallet/service/UTXOService.kt
@@ -14,8 +14,6 @@ import java.util.Collections
 
 class UTXOService(thread: MoneroHandlerThread?) : ServiceBase(thread) {
     private val _utxos = MutableLiveData<List<CoinsInfo>>()
-
-    @JvmField
     var utxos: LiveData<List<CoinsInfo>> = _utxos
     private var internalCachedUtxos: List<CoinsInfo> = ArrayList()
     private var frozenCoins = ArrayList<String?>()
@@ -137,7 +135,6 @@ class UTXOService(thread: MoneroHandlerThread?) : ServiceBase(thread) {
     }
 
     companion object {
-        @JvmStatic
         var instance: UTXOService? = null
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/mynero/wallet/util/DateHelper.kt b/app/src/main/java/net/mynero/wallet/util/DateHelper.kt
index 3b5777f..f149e30 100644
--- a/app/src/main/java/net/mynero/wallet/util/DateHelper.kt
+++ b/app/src/main/java/net/mynero/wallet/util/DateHelper.kt
@@ -20,7 +20,6 @@ import java.text.SimpleDateFormat
 import java.util.Date
 
 object DateHelper {
-    @JvmField
     val DATETIME_FORMATTER = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
 
     @Throws(ParseException::class)
diff --git a/app/src/main/java/net/mynero/wallet/util/Helper.kt b/app/src/main/java/net/mynero/wallet/util/Helper.kt
index 730f409..bf829ec 100644
--- a/app/src/main/java/net/mynero/wallet/util/Helper.kt
+++ b/app/src/main/java/net/mynero/wallet/util/Helper.kt
@@ -160,7 +160,6 @@ object Helper {
         return getDisplayAmount(amount, XMR_DECIMALS)
     }
 
-    @JvmStatic
     fun getDisplayAmount(amount: Long, maxDecimals: Int): String {
         // a Java bug does not strip zeros properly if the value is 0
         if (amount == 0L) return "0.00"
@@ -173,8 +172,7 @@ object Helper {
 
     fun getFormattedAmount(amount: Double, isCrypto: Boolean): String? {
         // at this point selection is XMR in case of error
-        val displayB: String?
-        displayB = if (isCrypto) {
+        val displayB: String? = if (isCrypto) {
             if (amount >= 0 || amount == 0.0) {
                 String.format(Locale.US, "%,.5f", amount)
             } else {
@@ -186,7 +184,6 @@ object Helper {
         return displayB
     }
 
-    @JvmStatic
     fun getDisplayAmount(amount: Double): String {
         // a Java bug does not strip zeros properly if the value is 0
         var d = BigDecimal(amount)
@@ -244,7 +241,6 @@ object Helper {
         return null
     }
 
-    @JvmStatic
     fun clipBoardCopy(context: Context?, label: String?, text: String?) {
         if (context != null) {
             val clipboardManager =
diff --git a/app/src/main/java/net/mynero/wallet/util/MoneroThreadPoolExecutor.kt b/app/src/main/java/net/mynero/wallet/util/MoneroThreadPoolExecutor.kt
index 2708ead..7ff7b35 100644
--- a/app/src/main/java/net/mynero/wallet/util/MoneroThreadPoolExecutor.kt
+++ b/app/src/main/java/net/mynero/wallet/util/MoneroThreadPoolExecutor.kt
@@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 
 object MoneroThreadPoolExecutor {
-    @JvmField
     var MONERO_THREAD_POOL_EXECUTOR: Executor? = null
     private val CPU_COUNT = Runtime.getRuntime().availableProcessors()
     private val CORE_POOL_SIZE = Math.max(2, Math.min(CPU_COUNT - 1, 4))
diff --git a/app/src/main/java/net/mynero/wallet/util/RestoreHeight.kt b/app/src/main/java/net/mynero/wallet/util/RestoreHeight.kt
index 4092cf6..ce7b860 100644
--- a/app/src/main/java/net/mynero/wallet/util/RestoreHeight.kt
+++ b/app/src/main/java/net/mynero/wallet/util/RestoreHeight.kt
@@ -195,7 +195,6 @@ class RestoreHeight internal constructor() {
         const val DIFFICULTY_TARGET = 120 // seconds
         private var Singleton: RestoreHeight? = null
 
-        @JvmStatic
         val instance: RestoreHeight?
             get() {
                 if (Singleton == null) {
diff --git a/app/src/main/java/net/mynero/wallet/util/UriData.kt b/app/src/main/java/net/mynero/wallet/util/UriData.kt
index 105a905..01144e5 100644
--- a/app/src/main/java/net/mynero/wallet/util/UriData.kt
+++ b/app/src/main/java/net/mynero/wallet/util/UriData.kt
@@ -4,7 +4,7 @@ import net.mynero.wallet.model.Wallet.Companion.getPaymentIdFromAddress
 import net.mynero.wallet.model.Wallet.Companion.isAddressValid
 import net.mynero.wallet.model.WalletManager.Companion.instance
 
-class UriData(@JvmField val address: String, val params: HashMap<String, String>) {
+class UriData(val address: String, val params: HashMap<String, String>) {
 
     fun hasPaymentId(): Boolean {
         return instance?.wallet?.nettype()?.let { getPaymentIdFromAddress(address, it) }
@@ -20,7 +20,6 @@ class UriData(@JvmField val address: String, val params: HashMap<String, String>
     }
 
     companion object {
-        @JvmStatic
         fun parse(uri: String): UriData? {
             if (uri.isEmpty()) return null
             val params = HashMap<String, String>()