From 56095d5024b978b7ee6661718c6bdec5b444c839 Mon Sep 17 00:00:00 2001
From: Ivo Zivkov <izivkov@gmail.com>
Date: Wed, 27 Nov 2024 13:56:15 -0500
Subject: [PATCH] Improve UI

---
 api/.gitignore                                |   1 -
 api/.idea/gradle.xml                          |  13 -
 api/.idea/misc.xml                            |   3 -
 api/.idea/workspace.xml                       |  62 --
 api/build.gradle                              |  82 ---
 api/consumer-rules.pro                        |   0
 api/module.md                                 |  24 -
 api/proguard-rules.pro                        |  21 -
 .../gshockapi/ExampleInstrumentedTest.kt      |  24 -
 api/src/main/AndroidManifest.xml              |   5 -
 .../main/java/org/avmedia/gshockapi/Alarm.kt  |  24 -
 .../main/java/org/avmedia/gshockapi/Event.kt  | 230 --------
 .../java/org/avmedia/gshockapi/EventDate.kt   |   9 -
 .../java/org/avmedia/gshockapi/EventPeriod.kt |   9 -
 .../java/org/avmedia/gshockapi/GShockAPI.kt   | 486 ----------------
 .../org/avmedia/gshockapi/GShockAPIMock.kt    | 313 ----------
 .../java/org/avmedia/gshockapi/IGShockAPI.kt  |  53 --
 .../org/avmedia/gshockapi/ProgressEvent.kt    | 226 --------
 .../java/org/avmedia/gshockapi/Settings.kt    |  50 --
 .../java/org/avmedia/gshockapi/WatchInfo.kt   | 151 -----
 .../org/avmedia/gshockapi/ble/Connection.kt   | 126 ----
 .../avmedia/gshockapi/ble/GShockScanner.kt    |  92 ---
 .../avmedia/gshockapi/ble/IDataReceived.kt    |  11 -
 .../avmedia/gshockapi/ble/IGShockManager.kt   | 243 --------
 .../org/avmedia/gshockapi/casio/Alarms.kt     |  75 ---
 .../avmedia/gshockapi/casio/CasioConstants.kt |  45 --
 .../gshockapi/casio/CasioTimeZoneHelper.kt    | 209 -------
 .../gshockapi/casio/MessageDispatcher.kt      |  84 ---
 .../avmedia/gshockapi/casio/ReminderMasks.kt  |  19 -
 .../java/org/avmedia/gshockapi/io/AlarmsIO.kt | 147 -----
 .../org/avmedia/gshockapi/io/AppInfoIO.kt     |  43 --
 .../avmedia/gshockapi/io/ButtonPressedIO.kt   |  60 --
 .../java/org/avmedia/gshockapi/io/CachedIO.kt |  56 --
 .../gshockapi/io/DstForWorldCitiesIO.kt       |  56 --
 .../avmedia/gshockapi/io/DstWatchStateIO.kt   |  46 --
 .../java/org/avmedia/gshockapi/io/ErrorIO.kt  |  14 -
 .../java/org/avmedia/gshockapi/io/EventsIO.kt | 543 ------------------
 .../org/avmedia/gshockapi/io/HomeTimeIO.kt    |  14 -
 .../main/java/org/avmedia/gshockapi/io/IO.kt  |  63 --
 .../org/avmedia/gshockapi/io/RunActionsIO.kt  |  19 -
 .../org/avmedia/gshockapi/io/SettingsIO.kt    | 211 -------
 .../avmedia/gshockapi/io/TimeAdjustmentIO.kt  | 135 -----
 .../java/org/avmedia/gshockapi/io/TimeIO.kt   | 233 --------
 .../java/org/avmedia/gshockapi/io/TimerIO.kt  |  89 ---
 .../org/avmedia/gshockapi/io/UnknownIO.kt     |  12 -
 .../gshockapi/io/WaitForConnectionIO.kt       |  61 --
 .../avmedia/gshockapi/io/WatchConditionIO.kt  |  56 --
 .../org/avmedia/gshockapi/io/WatchNameIO.kt   |  32 --
 .../org/avmedia/gshockapi/io/WorldCitiesIO.kt |  36 --
 .../java/org/avmedia/gshockapi/utils/Utils.kt | 160 ------
 .../gshockapi/utils/WatchDataListener.kt      |  42 --
 .../org/avmedia/gshockapi/ExampleUnitTest.kt  |  17 -
 app/build.gradle                              |   8 +-
 .../gshockGoogleSync/GShockApplication.kt     |   3 +-
 .../services/DeviceManager.kt                 |   2 +-
 .../avmedia/gshockGoogleSync/theme/Theme.kt   |   2 +
 .../gshockGoogleSync/ui/alarms/AlarmItem.kt   |   1 -
 .../ui/common/AppIntegerSelectionDialog.kt    |   4 +-
 .../ui/common/AppPhoneInputDialog.kt          |   1 -
 .../gshockGoogleSync/ui/common/AppText.kt     |   7 -
 .../ui/common/AppTextClickable.kt             |   1 -
 .../ui/common/AppTextExtraLarge.kt            |   3 -
 .../ui/common/AppTextField.kt                 |   5 -
 .../ui/common/AppTextLarge.kt                 |   8 -
 .../gshockGoogleSync/ui/common/AppTextLink.kt |   1 -
 .../ui/events/EventViewModel.kt               |   2 +-
 .../ui/others/RunActionsScreen.kt             |   1 -
 .../ui/settings/SettingsViewModel.kt          |   1 +
 .../ui/settings/TimeAdjustment.kt             |   4 +-
 .../gshockGoogleSync/ui/time/LocalTimeView.kt |   8 +-
 .../metadata/android/en-US/changelogs/203.txt |   2 -
 .../metadata/android/en-US/changelogs/204.txt |   2 -
 .../metadata/android/en-US/changelogs/205.txt |   2 -
 .../metadata/android/en-US/changelogs/208.txt |   3 +
 settings.gradle                               |   1 -
 75 files changed, 19 insertions(+), 4888 deletions(-)
 delete mode 100644 api/.gitignore
 delete mode 100644 api/.idea/gradle.xml
 delete mode 100644 api/.idea/misc.xml
 delete mode 100644 api/.idea/workspace.xml
 delete mode 100644 api/build.gradle
 delete mode 100644 api/consumer-rules.pro
 delete mode 100644 api/module.md
 delete mode 100644 api/proguard-rules.pro
 delete mode 100644 api/src/androidTest/java/org/avmedia/gshockapi/ExampleInstrumentedTest.kt
 delete mode 100644 api/src/main/AndroidManifest.xml
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/Alarm.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/Event.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/EventDate.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/EventPeriod.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/GShockAPI.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/GShockAPIMock.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/IGShockAPI.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/ProgressEvent.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/Settings.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/WatchInfo.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/ble/Connection.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/ble/GShockScanner.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/ble/IDataReceived.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/ble/IGShockManager.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/casio/Alarms.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/casio/CasioConstants.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/casio/CasioTimeZoneHelper.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/casio/MessageDispatcher.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/casio/ReminderMasks.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/AlarmsIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/AppInfoIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/ButtonPressedIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/CachedIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/DstForWorldCitiesIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/DstWatchStateIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/ErrorIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/EventsIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/HomeTimeIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/IO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/RunActionsIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/SettingsIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/TimeAdjustmentIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/TimeIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/TimerIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/UnknownIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/WaitForConnectionIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/WatchConditionIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/WatchNameIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/io/WorldCitiesIO.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/utils/Utils.kt
 delete mode 100644 api/src/main/java/org/avmedia/gshockapi/utils/WatchDataListener.kt
 delete mode 100644 api/src/test/java/org/avmedia/gshockapi/ExampleUnitTest.kt
 delete mode 100644 fastlane/metadata/android/en-US/changelogs/203.txt
 delete mode 100644 fastlane/metadata/android/en-US/changelogs/204.txt
 delete mode 100644 fastlane/metadata/android/en-US/changelogs/205.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/208.txt

diff --git a/api/.gitignore b/api/.gitignore
deleted file mode 100644
index 42afabfd..00000000
--- a/api/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/api/.idea/gradle.xml b/api/.idea/gradle.xml
deleted file mode 100644
index c6805255..00000000
--- a/api/.idea/gradle.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
-        <option name="resolveExternalAnnotations" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/api/.idea/misc.xml b/api/.idea/misc.xml
deleted file mode 100644
index 6dc90673..00000000
--- a/api/.idea/misc.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-</project>
\ No newline at end of file
diff --git a/api/.idea/workspace.xml b/api/.idea/workspace.xml
deleted file mode 100644
index b8f47d2b..00000000
--- a/api/.idea/workspace.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="NONE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="32297cb1-3076-4c85-80a8-0782abe4abe4" name="Changes" comment="" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ClangdSettings">
-    <option name="formatViaClangd" value="false" />
-  </component>
-  <component name="ExternalProjectsManager">
-    <system id="GRADLE">
-      <state>
-        <projects_view>
-          <tree_state>
-            <expand />
-            <select />
-          </tree_state>
-        </projects_view>
-      </state>
-    </system>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectId" id="2SODMjJj2LPAoZFXATmqTCS3B0D" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "android.gradle.sync.needed": "true",
-    "cf.first.check.clang-format": "false",
-    "cidr.known.project.marker": "true",
-    "git-widget-placeholder": "main"
-  }
-}]]></component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="32297cb1-3076-4c85-80a8-0782abe4abe4" name="Changes" comment="" />
-      <created>1689008687716</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1689008687716</updated>
-    </task>
-    <servers />
-  </component>
-</project>
\ No newline at end of file
diff --git a/api/build.gradle b/api/build.gradle
deleted file mode 100644
index 546fae92..00000000
--- a/api/build.gradle
+++ /dev/null
@@ -1,82 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-    id("org.jetbrains.dokka") version("1.9.0")
-}
-
-android {
-    namespace 'org.avmedia.gshockapi'
-    compileSdk 34
-
-    defaultConfig {
-        minSdk 24
-        targetSdk 34
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = '17'
-    }
-}
-
-dependencies {
-
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.12.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-
-    // Nordicsemi ble
-    implementation 'no.nordicsemi.android.kotlin.ble:scanner:1.0.16'
-    implementation 'no.nordicsemi.android.kotlin.ble:client:1.0.16'
-    implementation 'no.nordicsemi.android:ble:2.7.3'
-
-    implementation 'com.jakewharton.timber:timber:5.0.1'
-    implementation 'com.google.code.gson:gson:2.10'
-
-    // RxJava
-    implementation "io.reactivex.rxjava2:rxjava:2.2.8"
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-}
-
-dokkaHtml.configure {
-
-    outputDirectory.set(file("${rootDir}/docs"))
-
-    dokkaSourceSets {
-        configureEach {
-            includes.from("module.md")
-
-            includeNonPublic.set(false)
-            skipDeprecated.set(true)
-            reportUndocumented.set(false) // Emit warnings about not documented members
-
-            perPackageOption {
-                matchingRegex.set(".*ble")
-                suppress.set(true)
-            }
-            perPackageOption {
-                matchingRegex.set(".*casio")
-                suppress.set(true)
-            }
-            perPackageOption {
-                matchingRegex.set(".*utils")
-                suppress.set(true)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/api/consumer-rules.pro b/api/consumer-rules.pro
deleted file mode 100644
index e69de29b..00000000
diff --git a/api/module.md b/api/module.md
deleted file mode 100644
index 313361ad..00000000
--- a/api/module.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Module casio-g-shock-smart-sync-app
-
-# Package org.avmedia.gshockapi
-Casio G-Shock B5000/B5600/B2100 API
-
-## Description
-This library provides an API to communicate and issue commands to the Casio G-Shock B5000, B5600 and B2100
-series of watches via the Bluetooth interface. It can perform the following tasks:
-
-
-- Set watch's time
-- Set Home Time (Home City)
-- Set Alarms
-- Set Reminders
-- Set watch's settings.
-- Get watch's name
-- Get watch's battery level
-- Set watch's Timer
-
-
-*All the API functions are located in the **[GShockAPI]** class.*
-
-For a quick start, you can take a look at the `/app` directory of this project for an example app.
-
diff --git a/api/proguard-rules.pro b/api/proguard-rules.pro
deleted file mode 100644
index 481bb434..00000000
--- a/api/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/api/src/androidTest/java/org/avmedia/gshockapi/ExampleInstrumentedTest.kt b/api/src/androidTest/java/org/avmedia/gshockapi/ExampleInstrumentedTest.kt
deleted file mode 100644
index 629b0140..00000000
--- a/api/src/androidTest/java/org/avmedia/gshockapi/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.avmedia.gshockapi
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("org.avmedia.gshockapi.test", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/AndroidManifest.xml b/api/src/main/AndroidManifest.xml
deleted file mode 100644
index e2483f7f..00000000
--- a/api/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-</manifest>
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/Alarm.kt b/api/src/main/java/org/avmedia/gshockapi/Alarm.kt
deleted file mode 100644
index 0170729b..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/Alarm.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.avmedia.gshockapi
-
-data class Alarm(
-    var hour: Int,
-    var minute: Int,
-    var enabled: Boolean,
-    var hasHourlyChime: Boolean = false
-) {
-    override fun toString(): String {
-        return "Alarm(hour=$hour, minute=$minute, enabled=$enabled, hasHourlyChime=$hasHourlyChime)"
-    }
-
-    companion object {
-        var alarms: ArrayList<Alarm> = ArrayList()
-
-        fun addSorted(source: Array<Alarm>) {
-            alarms.addAll(if (source.size == 1) 0 else alarms.size, ArrayList(source.toList()))
-        }
-
-        fun clear() {
-            alarms.clear()
-        }
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/Event.kt b/api/src/main/java/org/avmedia/gshockapi/Event.kt
deleted file mode 100644
index ed7e0fd2..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/Event.kt
+++ /dev/null
@@ -1,230 +0,0 @@
-package org.avmedia.gshockapi
-
-import android.annotation.SuppressLint
-import android.os.Build
-import androidx.annotation.RequiresApi
-import androidx.core.util.Preconditions
-import org.avmedia.gshockapi.utils.Utils.getBooleanSafe
-import org.avmedia.gshockapi.utils.Utils.getStringSafe
-import org.json.JSONArray
-import org.json.JSONObject
-import timber.log.Timber
-import java.time.DayOfWeek
-import java.time.LocalDate
-import java.time.Month
-import java.util.Locale
-
-data class Event(
-    var title: String,
-    private var startDate: EventDate?,
-    var endDate: EventDate?,
-    private var repeatPeriod: RepeatPeriod,
-    private var daysOfWeek: ArrayList<DayOfWeek>?,
-    var enabled: Boolean,
-    var incompatible: Boolean,
-) {
-    init {
-        if (endDate == null) {
-            endDate = startDate
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    constructor(json: JSONObject) : this(
-        "", null, null, RepeatPeriod.NEVER, null, false, false
-    ) {
-        val event = createEvent(json)
-
-        this.title = event.title
-        this.startDate = event.startDate
-        this.endDate = event.endDate
-        this.repeatPeriod = event.repeatPeriod
-        this.daysOfWeek = event.daysOfWeek
-        this.enabled = event.enabled
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private fun createEvent(eventJsn: JSONObject): Event {
-
-        @RequiresApi(Build.VERSION_CODES.O)
-        fun getArrayListFromJSONArray(jsonArray: JSONArray): ArrayList<DayOfWeek> {
-            val list = ArrayList<DayOfWeek>()
-
-            fun stringToDayOfWeek(dayStr: String): DayOfWeek {
-                return when (dayStr) {
-                    "MONDAY" -> DayOfWeek.MONDAY
-                    "TUESDAY" -> DayOfWeek.TUESDAY
-                    "WEDNESDAY" -> DayOfWeek.WEDNESDAY
-                    "THURSDAY" -> DayOfWeek.THURSDAY
-                    "FRIDAY" -> DayOfWeek.FRIDAY
-                    "SATURDAY" -> DayOfWeek.SATURDAY
-                    "SUNDAY" -> DayOfWeek.SUNDAY
-                    else -> {
-                        DayOfWeek.MONDAY
-                    }
-                }
-            }
-
-            for (i in 0 until jsonArray.length()) {
-                val dayStr: String = jsonArray[i] as String
-                val dayOfWeek: DayOfWeek = stringToDayOfWeek(dayStr)
-                list.add(dayOfWeek)
-            }
-            return list
-        }
-
-        fun stringToMonth(monthStr: String): Month {
-            return when (monthStr.lowercase()) {
-                "january" -> Month.JANUARY
-                "february" -> Month.FEBRUARY
-                "march" -> Month.MARCH
-                "april" -> Month.APRIL
-                "may" -> Month.MAY
-                "june" -> Month.JUNE
-                "july" -> Month.JULY
-                "august" -> Month.AUGUST
-                "september" -> Month.SEPTEMBER
-                "october" -> Month.OCTOBER
-                "november" -> Month.NOVEMBER
-                "december" -> Month.DECEMBER
-                else -> Month.JANUARY
-            }
-        }
-
-        fun stringToRepeatPeriod(repeatPeriodStr: String): RepeatPeriod =
-            when (repeatPeriodStr.lowercase()) {
-                "daily" -> RepeatPeriod.DAILY
-                "weekly" -> RepeatPeriod.WEEKLY
-                "monthly" -> RepeatPeriod.MONTHLY
-                "yearly" -> RepeatPeriod.YEARLY
-                "never" -> RepeatPeriod.NEVER
-                else -> throw IllegalArgumentException("Invalid Repeat Period")
-            }
-
-        val timeObj = eventJsn.get("time") as JSONObject
-        val title = eventJsn.get("title") as String
-
-        val startDate = timeObj.get("startDate") as JSONObject
-        val endDate = timeObj.get("endDate") as JSONObject
-        val weekDays = timeObj.getJSONArray("daysOfWeek")
-        val enabled = timeObj.getBooleanSafe("enabled") ?: false
-        val incompatible = timeObj.getBooleanSafe("incompatible") ?: false
-        val repeatPeriod = stringToRepeatPeriod(timeObj.getStringSafe("repeatPeriod") as String)
-
-        return Event(
-            title,
-            EventDate(
-                startDate.getInt("year"),
-                stringToMonth(startDate.getString("month")),
-                startDate.getInt("day")
-            ),
-            EventDate(
-                endDate.getInt("year"),
-                stringToMonth(startDate.getString("month")),
-                endDate.getInt("day")
-            ),
-            repeatPeriod,
-            getArrayListFromJSONArray(weekDays),
-            enabled,
-            incompatible,
-        )
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    fun getPeriodFormatted(): String {
-        var period = ""
-        val thisYear = LocalDate.now().year
-
-        if (startDate != null) {
-            period += "${
-                capitalizeFirstAndTrim(
-                    startDate!!.month.toString(),
-                    3
-                )
-            }-${startDate!!.day}"
-            if (thisYear != startDate!!.year) {
-                period += ", ${startDate!!.year}"
-            }
-        }
-        if (endDate != null && !startDate!!.equals(endDate!!)) {
-            period += " to ${
-                capitalizeFirstAndTrim(
-                    endDate!!.month.toString(),
-                    3
-                )
-            }-${endDate!!.day}"
-            if (thisYear != endDate!!.year) {
-                period += ", ${endDate!!.year}"
-            }
-        }
-        return period
-    }
-
-    private fun getDaysOfWeekFormatted(): String {
-        var daysOfWeekStr = ""
-        if (daysOfWeek != null && daysOfWeek!!.size > 0) {
-            daysOfWeek!!.forEach {
-                daysOfWeekStr += "${capitalizeFirstAndTrim(it.name, 3)},"
-            }
-        } else {
-            return ""
-        }
-
-        return daysOfWeekStr.dropLast(1)
-    }
-
-    fun getFrequencyFormatted(): String {
-        var formattedFreq = ""
-        when (repeatPeriod) {
-            RepeatPeriod.WEEKLY -> {
-                formattedFreq = getDaysOfWeekFormatted()
-            }
-
-            RepeatPeriod.YEARLY -> {
-                formattedFreq = "${
-                    capitalizeFirstAndTrim(
-                        startDate?.month.toString(),
-                        3
-                    )
-                }-${startDate?.day}${getDayOfMonthSuffix(startDate?.day!!.toInt())} each year"
-            }
-
-            RepeatPeriod.MONTHLY -> {
-                formattedFreq =
-                    "${startDate?.day}${getDayOfMonthSuffix(startDate?.day!!.toInt())} each month"
-            }
-
-            RepeatPeriod.NEVER -> {
-                Timber.i("Single-time event...")
-            }
-
-            else -> {
-                Timber.i("Invalid frequency format")
-            }
-        }
-        return formattedFreq
-    }
-
-    private fun capitalizeFirstAndTrim(inStr: String, len: Int): String {
-        return inStr.lowercase(Locale.getDefault())
-            .replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
-            .substring(0, len)
-    }
-
-    @SuppressLint("RestrictedApi")
-    fun getDayOfMonthSuffix(n: Int): String {
-        Preconditions.checkArgument(n in 1..31, "illegal day of month: $n")
-        return if (n in 11..13) {
-            "th"
-        } else when (n % 10) {
-            1 -> "st"
-            2 -> "nd"
-            3 -> "rd"
-            else -> "th"
-        }
-    }
-
-    override fun toString(): String {
-        return "Event(title='$title', startDate=$startDate, endDate=$endDate, repeatPeriod=$repeatPeriod, daysOfWeek=$daysOfWeek, enabled=$enabled, incompatible=$incompatible)"
-    }
-}
diff --git a/api/src/main/java/org/avmedia/gshockapi/EventDate.kt b/api/src/main/java/org/avmedia/gshockapi/EventDate.kt
deleted file mode 100644
index 897db6f2..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/EventDate.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.avmedia.gshockapi
-
-import java.time.Month
-
-class EventDate(var year: Int, val month: Month, val day: Int) {
-    fun equals(eventDate: EventDate): Boolean {
-        return eventDate.year == year && eventDate.month == month && eventDate.day == day
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/EventPeriod.kt b/api/src/main/java/org/avmedia/gshockapi/EventPeriod.kt
deleted file mode 100644
index 692e0dfa..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/EventPeriod.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.avmedia.gshockapi
-
-enum class RepeatPeriod(val periodDuration: String) {
-    NEVER("NEVER"),
-    DAILY("DAILY"),
-    WEEKLY("WEEKLY"),
-    MONTHLY("MONTHLY"),
-    YEARLY("YEARLY")
-}
diff --git a/api/src/main/java/org/avmedia/gshockapi/GShockAPI.kt b/api/src/main/java/org/avmedia/gshockapi/GShockAPI.kt
deleted file mode 100644
index a17875d2..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/GShockAPI.kt
+++ /dev/null
@@ -1,486 +0,0 @@
-package org.avmedia.gshockapi
-
-import android.bluetooth.BluetoothDevice
-import android.content.Context
-import android.os.Build
-import androidx.annotation.RequiresApi
-import org.avmedia.gshockapi.ble.Connection
-import org.avmedia.gshockapi.casio.*
-import org.avmedia.gshockapi.io.*
-import org.avmedia.gshockapi.utils.*
-import timber.log.Timber
-import java.time.ZoneId
-import java.util.*
-
-/**
- * This class contains all the API functions. This should the the main interface to the library.
- *
- *
- * Here is how to use it:
- *
- * ```
- * private val api = GShockAPI(this)
- *
- * class MainActivity : AppCompatActivity() {
- *  override fun onCreate(savedInstanceState: Bundle?) {
- *      super.onCreate(savedInstanceState)
- *      ...
- *      GlobalScope.launch {
- *          api.waitForConnection(this)
- *          api.getPressedButton()
- *          api.getWatchName()
- *          api.getBatteryLevel()
- *          api.getTimer()
- *          api.getAppInfo()
- *          api.getHomeTime()
- *          api.setTime()
- *          ...
- *      }
- *  }
- * }
- * ```
- */
-
-@RequiresApi(Build.VERSION_CODES.O)
-class GShockAPI(private val context: Context) : IGShockAPI {
-
-    /**
-     * This function waits for the watch to connect to the phone.
-     * When connected, it returns and emits a `ConnectionSetupComplete` event, which
-     * can inform other parts of the app that the connection has taken place.
-     * @param[deviceId] Optional parameter containing a the Bluetooth ID
-     * of a watch which was previously connected. Providing this parameter will
-     * speed up connection. Its value can be saved in local storage for future use,
-     * and can be obtained after connection by calling `getDeviceId()`. Here is an example:
-     * ```
-     * private suspend fun waitForConnectionCached() {
-     *      var cachedDeviceAddress: String? =
-     *      LocalDataStorage.get("cached device", null, this@MainActivity)
-     *      api().waitForConnection(cachedDeviceAddress)
-     *      LocalDataStorage.put("cached device", api().getDeviceId(), this@MainActivity)
-     *   }
-     * ```
-     */
-
-    override suspend fun waitForConnection(deviceId: String?, deviceName: String?) {
-
-        Connection.stopBleScan()
-
-        val connectedStatus =
-            WaitForConnectionIO.request(context, deviceId, deviceName)
-        if (connectedStatus == "OK") {
-            init()
-        }
-    }
-
-    override suspend fun init(): Boolean {
-        IO.init()
-        getPressedButton()
-        ProgressEvents.onNext("ButtonPressedInfoReceived")
-
-        getAppInfo()
-        ProgressEvents.onNext("WatchInitializationCompleted")
-        return true
-    }
-
-    /**
-     * Returns a Boolean value indicating if the watch is currently commenced to the phone
-     */
-    override fun isConnected(): Boolean {
-        return Connection.isConnected()
-    }
-
-    /**
-     * Close the connection and free all associated resources.
-     * @param[deviceId] The deviceId associated with current connection.
-     * The `deviceId` can be obtained by calling `getDeviceId()` or from the
-     * payload in the `ProgressEvents.Events.Disconnect` event
-     */
-    override fun teardownConnection(device: BluetoothDevice) {
-        Connection.teardownConnection(device)
-    }
-
-    /**
-     * This function tells us which button was pressed on the watch to
-     * initiate the connection. Remember, the connection between the phone and the
-     * watch can only be initiated from the <b>watch</b>.
-     *
-     *
-     * The return values are interpreted as follows:
-     *
-     * - `LOWER_LEFT` - this connection is initiated by a long-press of the lower-left button on the watch.
-     * The app receiving this type of connection can now send and receive commands to the watch.
-     * - `LOWER_RIGHT` - this connection is initiated by a short-press of the lower-right button,
-     * which is usually used to set time. But the app can use this signal to perform other arbitrary functions.
-     * Therefore, this button is also referred as `ACTION BUTTON`.
-     * The connection will automatically disconnect in about 20 seconds.
-     * - `NO_BUTTON` - this connection is initiated automatically, periodically
-     * from the watch, without user input. It will automatically disconnect in about 20 seconds.
-     *
-     *
-     * *This function is relatively expensive, since it performs round trip to the watch to get the value. Therefore, it should be called only once each time the connection is established. The returned values will not change for the duration of the connection. After that, the user can call one of these lightweight functions:*
-     *
-     *
-     *   [isActionButtonPressed]
-     *
-     *
-     *   [isNormalButtonPressed]
-     *
-     *
-     *   [isAutoTimeStarted]
-     *
-     *
-     * @return [BluetoothWatch.WATCH_BUTTON]
-     **
-     * @seeCasioIO.WATCH_BUTTON
-     */
-    /* Do not get value from cache, because we do not want to
-    get all values here. */
-    override suspend fun getPressedButton(): IO.WATCH_BUTTON {
-        val value = ButtonPressedIO.request()
-        ButtonPressedIO.put(value)
-        return value
-    }
-
-    /**
-     * This function tells us if the connection was initiated by short-pressing the lower-right button on the
-     * watch, also known as ACTION BUTTON
-     *
-     * @return **true** if the lower-right button initiated the connection, **false** otherwise.
-     */
-    override fun isActionButtonPressed(): Boolean {
-        val button = ButtonPressedIO.get()
-        return button == IO.WATCH_BUTTON.LOWER_RIGHT
-    }
-
-    /**
-     * This function tells us if the connection was initiated by long-pressing the lower-left
-     * button on the watch
-     *
-     * @return **true** if the lower-left button initiated the connection, **false** otherwise.
-     */
-    override fun isNormalButtonPressed(): Boolean {
-        val button = ButtonPressedIO.get()
-        return button == IO.WATCH_BUTTON.LOWER_LEFT
-    }
-
-    /**
-     * This function tells us if the connection was initiated automatically by the watch, without the user
-     * pressing any button. This happens if Auto-Time is set in the setting. In this case, the
-     * watch will periodically connect at around 00:30, 06:30, 12:30 and 18:30
-     *
-     * @return **true** if watch automatically initiated the connection, **false** otherwise.
-     */
-    override fun isAutoTimeStarted(): Boolean {
-        val button = ButtonPressedIO.get()
-        return button == IO.WATCH_BUTTON.NO_BUTTON
-    }
-
-    /**
-     * This function tells us if the connection was initiated by ling-pressing the lower-right button on the
-     * watch, used to activate FIND PHONE action
-     *
-     * @return **true** if button pressed to activate FIND PHONE function, **false** otherwise.
-     */
-    override fun isFindPhoneButtonPressed(): Boolean {
-        val button = ButtonPressedIO.get()
-        return button == IO.WATCH_BUTTON.FIND_PHONE
-    }
-
-    /**
-     * Get the name of the watch.
-     *
-     * @return returns the name of the watch as a String. i.e. "GW-B5600"
-     */
-    override suspend fun getWatchName(): String {
-        return WatchNameIO.request()
-    }
-
-    override suspend fun getError(): String {
-        return ErrorIO.request()
-    }
-
-    /**
-     * Get the DST state of the watch.
-     *
-     * @return returns the Daylight Saving Time state of the watch as a String.
-     */
-    override suspend fun getDSTWatchState(state: IO.DTS_STATE): String {
-        return DstWatchStateIO.request(state)
-    }
-
-    /**
-     * Get the **Daylight Saving Time** for a particular World City set on the watch.
-     * There are 6 world cities that can be stored.
-     *
-     * @param cityNumber: index of the world city (0..5)
-     *
-     * @return Daylight Saving Time state of the requested World City as a String.
-     */
-    override suspend fun getDSTForWorldCities(cityNumber: Int): String {
-        return DstForWorldCitiesIO.request(cityNumber)
-    }
-
-    /**
-     * Get the name for a particular World City set on the watch.
-     * There are 6 world cities that can be stored.
-     *
-     * @param cityNumber Index of the world city (0..5)
-     *
-     * @return The name of the requested World City as a String.
-     */
-    override suspend fun getWorldCities(cityNumber: Int): String {
-        return WorldCitiesIO.request(cityNumber)
-    }
-
-    /**
-     * Get Home Time, (Home City).
-     *
-     * @return The name of Home City as a String.
-     */
-    override suspend fun getHomeTime(): String {
-        return HomeTimeIO.request()
-    }
-
-    /**
-     * Get Battery level.
-     *
-     * @return the battery level in percent as a String. E.g.: 83
-     */
-    override suspend fun getBatteryLevel(): Int {
-        return WatchConditionIO.request().batteryLevel
-    }
-
-    /**
-     * Get Watch Temperature.
-     *
-     * @return the watch's temperature in degree Celsius
-     */
-    override suspend fun getWatchTemperature(): Int {
-        return WatchConditionIO.request().temperature
-    }
-
-    /**
-     * Get Timer value in seconds.
-     *
-     * @return The timer number in seconds as an Int. E.g.: 180 means the timer is set for 3 minutes.
-     */
-    override suspend fun getTimer(): Int {
-        return TimerIO.request()
-    }
-
-    /**
-     * Set Timer value in seconds.
-     *
-     * @param timerValue Timer number of seconds as an Int.  E.g.: 180 means the timer will be set for 3 minutes.
-     */
-    override fun setTimer(timerValue: Int) {
-        TimerIO.set(timerValue)
-    }
-
-    /**
-     * Gets and internally sets app info to the watch.
-     * This is needed to re-enable lower-right button after the watch has been reset or BLE has been cleared.
-     * Call this function after each time the connection has been established.
-     *
-     * @return appInfo string from the watch.
-     */
-    override suspend fun getAppInfo(): String {
-        return AppInfoIO.request()
-    }
-
-
-    /**
-     * Sets the current time on the watch from the time on the phone. In addition, it can optionally set the Home Time
-     * to the current time zone. If timezone changes during travel, the watch will automatically be set to the
-     * correct time and timezone after running this function.
-     *
-     * @param timeZone Optional String parameter of form "region/city', i.e.: "Europe/Sofia".
-     * Example:
-     * ```
-     *      setTime()
-     *      setTime(TimeZone.getDefault().id)
-     *      setTime("Europe/Sofia")
-     *  ```
-     */
-    override suspend fun setTime(timeZone: String, timeMs: Long?) {
-
-        if (!ZoneId.getAvailableZoneIds().contains(timeZone)) {
-            Timber.e("GShockAPI", "setTime: Invalid timezone $timeZone passed")
-            ProgressEvents.onNext("ApiError")
-            return
-        }
-
-        TimeIO.setTimezone(timeZone)
-        TimeIO.set(timeMs)
-    }
-
-    /**
-     * Gets the current alarms from the watch. Up to 5 alarms are supported on the watch.
-     *
-     * @return ArrayList<[Alarm]>
-     */
-
-    override suspend fun getAlarms(): ArrayList<Alarm> {
-        return AlarmsIO.request()
-    }
-
-    /**
-     * Sets alarms to the watch. Up to 5 alarms are supported on the watch.
-     *
-     * @param ArrayList<[Alarm]>
-     */
-    override fun setAlarms(alarms: ArrayList<Alarm>) {
-        AlarmsIO.set(alarms)
-    }
-
-    /**
-     * Gets the current events (reminders) from the watch. Up to 5 events are supported.
-     *
-     * @return ArrayList<[Event]>
-     */
-    override suspend fun getEventsFromWatch(): ArrayList<Event> {
-
-        val events = ArrayList<Event>()
-
-        events.add(getEventFromWatch(1))
-        events.add(getEventFromWatch(2))
-        events.add(getEventFromWatch(3))
-        events.add(getEventFromWatch(4))
-        events.add(getEventFromWatch(5))
-
-        return events
-    }
-
-    /**
-     * Gets a single event (reminder) from the watch.
-     *
-     * @param eventNumber The index of the event 1..5
-     * @return [Event]
-     */
-    override suspend fun getEventFromWatch(eventNumber: Int): Event {
-        return EventsIO.request(eventNumber)
-    }
-
-    /**
-     * Sets events (reminders) to the watch. Up to 5 events are supported.
-     *
-     * @param ArrayList<[Event]>
-     */
-    override fun setEvents(events: ArrayList<Event>) {
-        EventsIO.set(events)
-    }
-
-    /**
-     * Clears all  events (reminders) from the watch. Up to 5 events are supported.
-     *
-     * @param none
-     */
-    override fun clearEvents() {
-        EventsIO.clearAll()
-    }
-
-    /**
-     * Get settings from the watch. Example:
-     *
-     * ```
-     *      val settings: Settings = getSettings()
-     *      settings.dateFormat = "MM:DD"
-     *      ...
-     *      setSettings(settings)
-     * ```
-     * @return [Settings]
-     */
-
-    override suspend fun getSettings(): Settings {
-        val settings = getBasicSettings()
-        val timeAdjustment = getTimeAdjustment()
-        settings.timeAdjustment = timeAdjustment.isTimeAdjustmentSet
-        settings.adjustmentTimeMinutes = timeAdjustment.adjustmentTimeMinutes
-        return settings
-    }
-
-    override suspend fun getBasicSettings(): Settings {
-        return SettingsIO.request()
-    }
-
-    override suspend fun getTimeAdjustment(): TimeAdjustmentInfo {
-        return TimeAdjustmentIO.request()
-    }
-
-    /**
-     * Set settings to the watch. Populate a [Settings] and call this function. Example:
-     *
-     * ```
-     *      val settings: Settings = getSettings()
-     *      settingsSimpleModel.dateFormat = "MM:DD"
-     *      ...
-     *      setSettings(settings)
-     * ```
-     *
-     * @param settings
-     */
-    override fun setSettings(settings: Settings) {
-        SettingsIO.set(settings)
-        TimeAdjustmentIO.set(settings)
-    }
-
-    /**
-     * Get the Bluetooth ID of the connected watch
-     *
-     * @return watch's Bluetooth ID as a String. Should look something like: "ED:85:83:38:62:17"
-     */
-
-    /**
-     * Disconnect from the watch
-     *
-     * @param context [Context]
-     */
-    override fun disconnect() {
-        Connection.disconnect()
-    }
-
-    // for compatibility.
-    @Deprecated(
-        message = "This function is deprecated, use disconnect() instead",
-        replaceWith = ReplaceWith("disconnect()"),
-        level = DeprecationLevel.WARNING
-    )
-    fun disconnect(context:Context) {
-        disconnect()
-    }
-
-    override fun stopScan() {
-        Connection.stopBleScan()
-    }
-
-    override fun close() {
-        Connection.close()
-    }
-
-    /**
-     * Tells us if Bluetooth is currently enabled on the phone. If not, the app can take action to enable it.
-     *
-     * @return *true* if enables, *false* otherwise.
-     */
-    override fun isBluetoothEnabled(context: Context): Boolean {
-        return Connection.isBluetoothEnabled(context)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    override fun sendMessage(message: String) {
-        MessageDispatcher.sendToWatch(message)
-    }
-
-    override fun resetHand() {
-        sendMessage("{action: \"RESET_HAND\", value: \"\"}")
-    }
-
-    override fun validateBluetoothAddress(deviceAddress: String?): Boolean {
-        return Connection.validateAddress(deviceAddress)
-    }
-
-    override fun preventReconnection(): Boolean {
-        return true
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/GShockAPIMock.kt b/api/src/main/java/org/avmedia/gshockapi/GShockAPIMock.kt
deleted file mode 100644
index c3726c95..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/GShockAPIMock.kt
+++ /dev/null
@@ -1,313 +0,0 @@
-package org.avmedia.gshockapi
-
-import android.bluetooth.BluetoothDevice
-import android.content.Context
-import android.os.Build
-import androidx.annotation.RequiresApi
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import org.avmedia.gshockapi.io.IO
-import org.avmedia.gshockapi.io.TimeAdjustmentInfo
-import java.time.DayOfWeek
-import java.time.Month
-
-
-/*
-This class is used during development to mock the GShock API.
- */
-@RequiresApi(Build.VERSION_CODES.O)
-class GShockAPIMock(private val context: Context) : IGShockAPI {
-
-    private val scope = CoroutineScope(Dispatchers.Default)
-
-    init {
-        scope.launch {
-            WatchInfo.setNameAndModel(getWatchName())
-        }
-    }
-
-    override suspend fun waitForConnection(deviceId: String?, deviceName: String?) {
-//        ProgressEvents.onNext("WaitForConnection")
-//        delay(1000)
-
-        ProgressEvents.onNext("DeviceName", "CASIO GW-B5600")
-        //delay(1000)
-
-        ProgressEvents.onNext("ConnectionStarted")
-        // delay(1000)
-
-        ProgressEvents.onNext("WatchInitializationCompleted")
-        ProgressEvents.onNext("ConnectionSetupComplete")
-        // delay(1000)
-        ProgressEvents.onNext("ButtonPressedInfoReceived")
-
-        // delay(1000)
-        // ProgressEvents.onNext()
-        // delay(1000)
-    }
-
-    override suspend fun init(): Boolean {
-        return true
-    }
-
-    override fun close() {
-    }
-
-    override fun isConnected(): Boolean {
-        return true
-    }
-
-    override fun teardownConnection(device: BluetoothDevice) {
-        // NO-OP
-    }
-
-    override suspend fun getPressedButton(): IO.WATCH_BUTTON {
-        return IO.WATCH_BUTTON.LOWER_LEFT
-    }
-
-    override fun isActionButtonPressed(): Boolean {
-        return false
-    }
-
-    override fun isNormalButtonPressed(): Boolean {
-        return true
-    }
-
-    override fun isAutoTimeStarted(): Boolean {
-        return false
-    }
-
-    override fun isFindPhoneButtonPressed(): Boolean {
-        return false
-    }
-
-    override suspend fun getWatchName(): String {
-        return "CASIO GW-B5600"
-        // return "CASIO ECB-30"
-    }
-
-    override suspend fun getError(): String {
-        return "Error"
-    }
-
-    override suspend fun getDSTWatchState(state: IO.DTS_STATE): String {
-        /*
-        DST STATE ZERO: 0x1D 00 01 03 02 02 76 00 00 FF FF FF FF FF FF
-        DST STATE TWO: 0x1D 02 03 03 03 A0 00 DC 00 FF FF FF FF FF FF
-        DST STATE FOUR: 0x1D 04 05 02 03 7A 00 CA 00 FF FF FF FF FF FF
-         */
-        return "0x1D 00 01 03 02 02 76 00 00 FF FF FF FF FF FF"
-    }
-
-    override suspend fun getDSTForWorldCities(cityNumber: Int): String {
-        return when (cityNumber) {
-            0 -> "0x1E 00 02 76 EC 04 01"
-            1 -> "0x1E 01 00 00 00 00 00"
-            2 -> "0x1E 02 A0 00 00 04 02"
-            3 -> "0x1E 03 DC 00 04 04 02"
-            4 -> "0x1E 04 7A 00 20 04 00"
-            5 -> "0x1E 05 CA 00 EC 04 01"
-            else -> ""
-        }
-    }
-
-    override suspend fun getWorldCities(cityNumber: Int): String {
-        return when (cityNumber) {
-            0 -> "0x1F 00 54 4F 52 4F 4E 54 4F 00 00 00 00 00 00 00 00 00 00 00"
-            1 -> "0x1F 01 28 55 54 43 29 00 00 00 00 00 00 00 00 00 00 00 00 00"
-            2 -> "0x1F 02 4C 4F 4E 44 4F 4E 00 00 00 00 00 00 00 00 00 00 00 00"
-            3 -> "0x1F 03 50 41 52 49 53 00 00 00 00 00 00 00 00 00 00 00 00 00"
-            4 -> "0x1F 04 48 4F 4E 47 20 4B 4F 4E 47 00 00 00 00 00 00 00 00 00"
-            5 -> "00x1F 05 4E 45 57 20 59 4F 52 4B 00 00 00 00 00 00 00 00 00 00"
-            else -> ""
-        }
-    }
-
-    override suspend fun getHomeTime(): String {
-        return "SOFIA"
-    }
-
-    override suspend fun getBatteryLevel(): Int {
-        return 81
-    }
-
-    override suspend fun getWatchTemperature(): Int {
-        return 37
-    }
-
-    override suspend fun getTimer(): Int {
-        return 4 * 60
-    }
-
-    override fun setTimer(timerValue: Int) {
-        println("Timer set to $timerValue")
-    }
-
-    override suspend fun getAppInfo(): String {
-        return "0x22 C7 67 B2 F0 78 86 71 6A 76 EC 02"
-    }
-
-    override suspend fun setTime(timeZone: String, timeMs: Long?) {
-        println("Time set to $timeZone")
-    }
-
-    override suspend fun getAlarms(): ArrayList<Alarm> {
-        delay(0)
-
-        val alarmList: ArrayList<Alarm> = arrayListOf(
-            Alarm(hour = 6, minute = 45, enabled = true, hasHourlyChime = true),
-            Alarm(hour = 8, minute = 0, enabled = true, hasHourlyChime = false),
-            Alarm(hour = 20, minute = 0, enabled = true, hasHourlyChime = false),
-            Alarm(hour = 20, minute = 50, enabled = false, hasHourlyChime = false),
-            Alarm(hour = 9, minute = 25, enabled = false, hasHourlyChime = false)
-        )
-        return alarmList
-    }
-
-    override fun setAlarms(alarms: ArrayList<Alarm>) {
-        println("Alarms set: $alarms")
-    }
-
-    override suspend fun getEventsFromWatch(): ArrayList<Event> {
-
-        val eventList: ArrayList<Event> = arrayListOf(
-            Event(
-                title = "Event 1",
-                startDate = EventDate(
-                    2024,
-                    Month.MAY,
-                    1
-                ), // Replace with actual EventDate structure
-                endDate = EventDate(2024, Month.MAY, 2),
-                repeatPeriod = RepeatPeriod.NEVER,
-                daysOfWeek = arrayListOf(DayOfWeek.MONDAY),
-                enabled = false,
-                incompatible = false
-            ),
-            Event(
-                title = "Event 2",
-                startDate = EventDate(
-                    2024,
-                    Month.MAY,
-                    1
-                ), // Replace with actual EventDate structure
-                endDate = EventDate(2024, Month.MAY, 2),
-                repeatPeriod = RepeatPeriod.NEVER,
-                daysOfWeek = arrayListOf(DayOfWeek.MONDAY),
-                enabled = false,
-                incompatible = false
-            ),
-            Event(
-                title = "Event 3",
-                startDate = EventDate(
-                    2024,
-                    Month.MAY,
-                    1
-                ), // Replace with actual EventDate structure
-                endDate = EventDate(2024, Month.MAY, 2),
-                repeatPeriod = RepeatPeriod.NEVER,
-                daysOfWeek = arrayListOf(DayOfWeek.MONDAY),
-                enabled = false,
-                incompatible = false
-            ),
-            Event(
-                title = "Event 4",
-                startDate = EventDate(
-                    2024,
-                    Month.MAY,
-                    1
-                ), // Replace with actual EventDate structure
-                endDate = EventDate(2024, Month.MAY, 2),
-                repeatPeriod = RepeatPeriod.NEVER,
-                daysOfWeek = arrayListOf(DayOfWeek.MONDAY),
-                enabled = false,
-                incompatible = false
-            )
-        )
-
-        return eventList
-
-    }
-
-    override suspend fun getEventFromWatch(eventNumber: Int): Event {
-        return Event(
-            title = "Event 10",
-            startDate = EventDate(2024, Month.MAY, 1), // Replace with actual EventDate structure
-            endDate = EventDate(2024, Month.MAY, 2),
-            repeatPeriod = RepeatPeriod.NEVER,
-            daysOfWeek = arrayListOf(DayOfWeek.MONDAY),
-            enabled = false,
-            incompatible = false
-        )
-    }
-
-    override fun setEvents(events: ArrayList<Event>) {
-        println("Events set: $events")
-    }
-
-    override fun clearEvents() {
-        println("Events cleared")
-    }
-
-    override suspend fun getSettings(): Settings {
-        delay(0)
-
-        val setting = Settings()
-        setting.language = "Spanish"
-        setting.timeFormat = "12h"
-        setting.dateFormat = "MM:DD"
-
-        setting.buttonTone = true
-        setting.powerSavingMode = true
-        setting.autoLight = true
-        setting.lightDuration = "4s"
-
-        setting.timeAdjustment = true
-        setting.adjustmentTimeMinutes = 29
-
-        return setting
-    }
-
-    override suspend fun getBasicSettings(): Settings {
-        return Settings()
-    }
-
-    override suspend fun getTimeAdjustment(): TimeAdjustmentInfo {
-        return TimeAdjustmentInfo(true, 30)
-    }
-
-    override fun setSettings(settings: Settings) {
-        println("Settings set: $settings")
-    }
-
-    override fun disconnect() {
-        println("Disconnected")
-    }
-
-    override fun stopScan() {
-        println("Scan stopped")
-    }
-
-    override fun isBluetoothEnabled(context: Context): Boolean {
-        return false
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    override fun sendMessage(message: String) {
-        println("Message sent: $message")
-    }
-
-    override fun resetHand() {
-        println("Hand reset")
-    }
-
-    override fun validateBluetoothAddress(deviceAddress: String?): Boolean {
-        return true
-    }
-
-    override fun preventReconnection(): Boolean {
-        return true
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/IGShockAPI.kt b/api/src/main/java/org/avmedia/gshockapi/IGShockAPI.kt
deleted file mode 100644
index 5f8f7923..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/IGShockAPI.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.avmedia.gshockapi
-
-import android.bluetooth.BluetoothDevice
-import android.content.Context
-import android.os.Build
-import androidx.annotation.RequiresApi
-import org.avmedia.gshockapi.io.IO
-import org.avmedia.gshockapi.io.TimeAdjustmentInfo
-import java.util.TimeZone
-
-interface IGShockAPI {
-    suspend fun waitForConnection(deviceId: String? = "", deviceName: String? = "")
-    suspend fun init(): Boolean
-    fun isConnected(): Boolean
-    fun teardownConnection(device: BluetoothDevice)
-    suspend fun getPressedButton(): IO.WATCH_BUTTON
-    fun isActionButtonPressed(): Boolean
-    fun isNormalButtonPressed(): Boolean
-    fun isAutoTimeStarted(): Boolean
-    fun isFindPhoneButtonPressed(): Boolean
-    suspend fun getWatchName(): String
-    suspend fun getError(): String
-    suspend fun getDSTWatchState(state: IO.DTS_STATE): String
-    suspend fun getDSTForWorldCities(cityNumber: Int): String
-    suspend fun getWorldCities(cityNumber: Int): String
-    suspend fun getHomeTime(): String
-    suspend fun getBatteryLevel(): Int
-    suspend fun getWatchTemperature(): Int
-    suspend fun getTimer(): Int
-    fun setTimer(timerValue: Int)
-    suspend fun getAppInfo(): String
-    suspend fun setTime(timeZone: String = TimeZone.getDefault().id, timeMs: Long? = null)
-    suspend fun getAlarms(): ArrayList<Alarm>
-    fun setAlarms(alarms: ArrayList<Alarm>)
-    suspend fun getEventsFromWatch(): ArrayList<Event>
-    suspend fun getEventFromWatch(eventNumber: Int): Event
-    fun setEvents(events: ArrayList<Event>)
-    fun clearEvents()
-    suspend fun getSettings(): Settings
-    suspend fun getBasicSettings(): Settings
-    suspend fun getTimeAdjustment(): TimeAdjustmentInfo
-    fun setSettings(settings: Settings)
-    fun disconnect()
-    fun stopScan()
-    fun close()
-    fun isBluetoothEnabled(context: Context): Boolean
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    fun sendMessage(message: String)
-    fun resetHand()
-    fun validateBluetoothAddress(deviceAddress: String?): Boolean
-    fun preventReconnection(): Boolean
-}
diff --git a/api/src/main/java/org/avmedia/gshockapi/ProgressEvent.kt b/api/src/main/java/org/avmedia/gshockapi/ProgressEvent.kt
deleted file mode 100644
index 6923ea72..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/ProgressEvent.kt
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Created by Ivo Zivkov (izivkov@gmail.com) on 2022-03-30, 12:06 a.m.
- * Copyright (c) 2022 . All rights reserved.
- * Last modified 2022-03-28, 3:48 p.m.
- */
-
-package org.avmedia.gshockapi
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.launch
-import org.avmedia.gshockapi.ProgressEvents.Events
-import org.avmedia.gshockapi.ProgressEvents.Subscriber
-import timber.log.Timber
-
-/**
- * This class is used to send RX events to the rest of the library and to the application to inform
- * them of some internal events. For example, when a connection is established, a `"ConnectionSetupComplete"`
- * event is broadcast. If the application is listening on this event, it can change its UI to reflect this.
- * The app can call [Subscriber.start] method to start listening to events.
- * Here is an example which can reside in the `MainActivity`:
- *
- * ```
- * private fun listenToProgressEvents() {
- *   ProgressEvents.subscriber.start(this.javaClass.canonicalName,
- *       {
- *           when (it) {
- *              ProgressEvents["ConnectionSetupComplete"] -> {
- *                  println("Got \"ConnectionSetupComplete\" event")
- *              }
- *              ProgressEvents[] -> {
- *                  println("Got \"Disconnect\" event")
- *              }
- *              ProgressEvents["ConnectionFailed"] -> {
- *                  println("Got \"ConnectionFailed\" event")
- *              }
- *              ProgressEvents["WatchInitializationCompleted"] -> {
- *                  println("Got \"WatchInitializationCompleted\" event")
- *              }
- *              ProgressEvents["CustomEvent"] -> {
- *                  println("Got \"CustomEvent\" event")
- *              }
- *           }, { throwable ->
- *              println("Got error on subscribe: $throwable")
- *              throwable.printStackTrace()
- *           })
- *       }
- *   }
- * }
- * ```
- * @see Events
- *
- */
-
-interface IEventAction {
-    val label: String
-    val action: () -> Unit
-}
-
-data class EventAction(
-    override val label: String,
-    override val action: () -> Unit
-) : IEventAction
-
-object ProgressEvents {
-    val subscriber = Subscriber()
-    private val eventsFlow: MutableSharedFlow<Events> =
-        MutableSharedFlow(replay = 10) // Replay last 10 events
-
-    fun runEventActions(name: String, eventActions: Array<EventAction>) {
-        subscriber.runEventActions(name, eventActions)
-    }
-
-    private val subscribers: MutableSet<String> = LinkedHashSet()
-
-    class Subscriber {
-        /**
-         * Call this from anywhere to start listening to [ProgressEvents].
-         *
-         * @param name This should be a unique name to prevent multiple subscriptions. Only one
-         * subscription per name is allowed.
-         */
-        fun runEventActions(name: String, eventActions: Array<EventAction>) {
-            if (subscribers.contains(name)) return  // Prevent duplicate subscriptions
-            subscribers.add(name)
-
-            val runActions: suspend () -> Unit = {
-                val actionMap = eventActions.associateBy { it.label }
-
-                val onNext: (Events) -> Unit = { event ->
-                    val nameOfEvent = reverseEventMap[event]
-                    if (nameOfEvent != null) {
-                        actionMap[nameOfEvent]?.action?.invoke()
-                    }
-                }
-
-                val onError: (Throwable) -> Unit = { throwable ->
-                    Timber.d("Error on subscribe: $throwable")
-                    throwable.printStackTrace()
-                }
-
-                CoroutineScope(Dispatchers.Main).launch {
-                    eventsFlow
-                        .filter { true }
-                        .catch { onError(it) }
-                        .collect { onNext(it) }
-                }
-            }
-
-            CoroutineScope(Dispatchers.Main).launch { runActions() }
-        }
-
-        /**
-         * Stop listening on [ProgressEvents]
-         *
-         * @param name Name of the subscriber
-         */
-        fun stop(name: String) {
-            subscribers.remove(name)
-        }
-    }
-
-
-    /**
-     * The application can broadcast built-in events by calling this function.
-     * ```
-     *  ProgressEvents.onNext("AllPermissionsAccepted", [payload])
-     * ```
-     * Also, the app can add its own events by passing an arbitrary string to "onNext":
-     *
-     * ```
-     *  ProgressEvents.onNext("CustomEvent")
-     * ```
-     * and then listen on this event using the `start()` function, just like it was a built-in event:
-     * ```
-     * ProgressEvents.subscriber.start(this.javaClass.canonicalName, {
-     *  when (it) {
-     *      ProgressEvents["CustomEvent"] -> {
-     *      // ...
-     *    }
-    ```
-     *
-     * @param eventName: Name of event to broadcast
-     * @param payload: An optional parameter containing a payload of type `Any?`
-     */
-    fun onNext(eventName: String, payload: Any? = null) {
-        if (!eventMap.containsKey(eventName)) addEvent(eventName)
-
-        val event = eventMap[eventName]?.apply { this.payload = payload }
-        if (subscribers.isNotEmpty() && event != null) {
-            CoroutineScope(Dispatchers.Main).launch {
-                eventsFlow.emit(event)
-            }
-        }
-    }
-
-    operator fun get(eventName: String): Events? = eventMap[eventName]
-
-    private fun addEvent(eventName: String) {
-        if (eventMap.containsKey(eventName)) return
-        val newEvent = Events()
-        eventMap[eventName] = newEvent
-        reverseEventMap[newEvent] = eventName
-    }
-
-    fun getPayload(eventName: String): Any? {
-        return eventMap[eventName]?.payload
-    }
-
-    fun addPayload(eventName: String, payload: Any?) {
-        eventMap[eventName]?.payload = payload
-    }
-
-    /**
-     * This class contains built-in and custom events which the library can broadcast to the application.
-     * Here is a list of the built-in events:
-     * ```
-     * "Init"
-     * "ConnectionStarted"
-     * "ConnectionSetupComplete"
-     * "Disconnect"
-     * "AlarmDataLoaded"
-     * "NotificationsEnabled"
-     * "NotificationsDisabled"
-     * "WatchInitializationCompleted"
-     * "AllPermissionsAccepted"
-     * "ButtonPressedInfoReceived"
-     * "ConnectionFailed"
-     * "SettingsLoaded"
-     * "NeedToUpdateUI"
-     * "CalendarUpdated"
-     * "HomeTimeUpdated"
-     * "ApiError"
-     * ```
-     * The App can add their own arbitrary events like this:
-     * ```
-     * ProgressEvents.addEvent("MyCustomEvent")
-     * ```
-     */
-    open class Events(var payload: Any? = null)
-
-    private var eventMap = mutableMapOf<String, Events>(
-        "Init" to Events(),
-        "ConnectionStarted" to Events(),
-        "ConnectionSetupComplete" to Events(),
-        "Disconnect" to Events(),
-        "AlarmDataLoaded" to Events(),
-        "NotificationsEnabled" to Events(),
-        "NotificationsDisabled" to Events(),
-        "WatchInitializationCompleted" to Events(),
-        "AllPermissionsAccepted" to Events(),
-        "ButtonPressedInfoReceived" to Events(),
-        "ConnectionFailed" to Events(),
-        "SettingsLoaded" to Events(),
-        "NeedToUpdateUI" to Events(),
-        "CalendarUpdated" to Events(),
-        "HomeTimeUpdated" to Events(),
-        "ApiError" to Events(),
-    )
-
-    private val reverseEventMap =
-        eventMap.entries.associateBy({ it.value }, { it.key }).toMutableMap()
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/Settings.kt b/api/src/main/java/org/avmedia/gshockapi/Settings.kt
deleted file mode 100644
index c4f872a9..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/Settings.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.avmedia.gshockapi
-
-class Settings {
-    /**
-     * "12h" or "24h"
-     */
-    var timeFormat = ""
-
-    /**
-     * "DD:MM" or "MM:DD"
-     */
-    var dateFormat = ""
-
-    /*
-    "English", "French", "Spanish", "German", "Italian" or "Russian"
-     */
-    var language = ""
-
-    /**
-     * true or false
-     */
-    var autoLight = false
-
-    /**
-     * "2s" or "4s"
-     */
-    var lightDuration = ""
-
-    /**
-     * true or false
-     */
-    var powerSavingMode = false
-
-    /**
-     * true or false
-     */
-    var buttonTone = true
-
-    /**
-     * true or false
-     */
-    var timeAdjustment = true
-
-    var adjustmentTimeMinutes = 30
-
-    var fineAdjustment = 0
-
-    // for always-connected watches only, like the ECB-30
-    var DnD = false
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/WatchInfo.kt b/api/src/main/java/org/avmedia/gshockapi/WatchInfo.kt
deleted file mode 100644
index 5dcd2a80..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/WatchInfo.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.avmedia.gshockapi
-
-/**
- * This class keeps information about the characteristics of the currently connected watch.
- * Based on that, the application can display different information.
- */
-object WatchInfo {
-    enum class WATCH_MODEL {
-        GA, GW, DW, GMW, GPR, GST, MSG, GB001, GBD, MRG_B5000, GCW_B5000, EQB, ECB, UNKNOWN
-    }
-
-    var name: String = ""
-    var shortName = ""
-    private var address: String = ""
-
-    var model = WATCH_MODEL.UNKNOWN
-
-    var worldCitiesCount = 2
-    var dstCount = 3
-    private var alarmCount = 5
-    var hasAutoLight = false
-    var hasReminders = false
-    var shortLightDuration = "2s"
-    var longLightDuration = "4s"
-    var weekLanguageSupported = true
-    var worldCities = true
-    var hasTemperature = true
-    var hasBatteryLevel: Boolean = true
-
-    //  Battery level between 15 and 20 for B2100 and between 9 and 19 for B5600. Scale accordingly to %
-    var batteryLevelLowerLimit = 15
-    var batteryLevelUpperLimit = 20
-
-    var alwaysConnected = false
-    var findButtonUserDefined = false
-    var hasPowerSavingMode = true
-
-    /**
-     * Info about the model.
-     */
-    data class ModelInfo(
-        var model: WATCH_MODEL,
-        var worldCitiesCount: Int,
-        var dstCount: Int,
-        var alarmCount: Int,
-        var hasAutoLight: Boolean,
-        var hasReminders: Boolean,
-        var shortLightDuration: String,
-        val longLightDuration: String,
-        val weekLanguageSupported: Boolean = true,
-        val worldCities: Boolean = true,
-        val hasBatteryLevel: Boolean = true,
-        val hasTemperature: Boolean = true,
-        val batteryLevelLowerLimit: Int = 15,
-        val batteryLevelUpperLimit: Int = 20,
-        val alwaysConnected: Boolean = false,
-        val findButtonUserDefined: Boolean = false,
-        val hasPowerSavingMode: Boolean = true,
-    )
-
-    // @formatter:off
-    private val models = listOf (
-        ModelInfo(WATCH_MODEL.GW, 6, 3, 5, hasAutoLight = true, hasReminders = true, shortLightDuration = "2s", longLightDuration = "4s", batteryLevelLowerLimit = 9, batteryLevelUpperLimit = 19),
-        ModelInfo(WATCH_MODEL.MRG_B5000, 6, 3, 5, hasAutoLight = true, hasReminders = true, shortLightDuration = "2s", longLightDuration = "4s", batteryLevelLowerLimit = 9, batteryLevelUpperLimit = 19),
-        ModelInfo(WATCH_MODEL.GCW_B5000, 6, 3, 5, hasAutoLight = true, hasReminders = true, shortLightDuration = "2s", longLightDuration = "4s", batteryLevelLowerLimit = 9, batteryLevelUpperLimit = 19),
-        ModelInfo(WATCH_MODEL.GMW, 6, 3, 5, hasAutoLight = true, hasReminders = true, shortLightDuration = "2s", longLightDuration = "4s", batteryLevelLowerLimit = 9, batteryLevelUpperLimit = 19),
-        ModelInfo(WATCH_MODEL.GST, 2, 1, 5, hasAutoLight = false, hasReminders = true, shortLightDuration = "1.5s", longLightDuration = "3s"),
-        ModelInfo(WATCH_MODEL.GA, 2, 1, 5, hasAutoLight = false, hasReminders = true, shortLightDuration = "1.5s", longLightDuration = "3s"),
-        ModelInfo(WATCH_MODEL.GB001, 2, 1, 5, hasAutoLight = true, hasReminders = false, shortLightDuration = "1.5s", longLightDuration = "3s"),
-        ModelInfo(WATCH_MODEL.MSG, 2, 1, 5, hasAutoLight = false, hasReminders = true, shortLightDuration = "1.5s", longLightDuration = "3s"),
-        ModelInfo(WATCH_MODEL.GPR, 2, 1, 5, hasAutoLight = true, hasReminders = false, shortLightDuration = "1.5s", longLightDuration = "3s", weekLanguageSupported = false),
-        ModelInfo(WATCH_MODEL.DW, 2, 1, 5, hasAutoLight = true, hasReminders = false, shortLightDuration = "1.5s", longLightDuration = "3s"),
-        ModelInfo(WATCH_MODEL.GBD, 2, 1, 5, hasAutoLight = true, hasReminders = false, shortLightDuration = "1.5s", longLightDuration = "3s", worldCities = false, hasTemperature = false),
-        ModelInfo(WATCH_MODEL.EQB, 2, 1, 5, hasAutoLight = true, hasReminders = false, shortLightDuration = "1.5s", longLightDuration = "3s", worldCities = false, hasTemperature = false),
-        ModelInfo(WATCH_MODEL.ECB, 2, 1, 5, hasAutoLight = true, hasReminders = false, shortLightDuration = "1.5s", longLightDuration = "3s", worldCities = true, hasTemperature = false, hasBatteryLevel = false,
-            alwaysConnected = true, findButtonUserDefined=true, hasPowerSavingMode=false),
-        ModelInfo(WATCH_MODEL.UNKNOWN, 2, 1, 5, hasAutoLight = true, hasReminders = true, shortLightDuration = "1.5s", longLightDuration = "3s")
-    )
-    // @formatter:on
-
-    private val modelMap = models.associateBy { it.model }
-
-    /**
-     * When we obtain the name of the watch from the BLE connection, we need to call this method.
-     * From here, we can determine and set all the model's characteristics.
-     */
-    fun setNameAndModel(name: String) {
-        this.name = name
-
-        // name is like: CASIO GW-B5600
-        val parts = this.name.split(" ")
-        if (parts.size > 1) {
-            shortName = parts[1]
-        }
-
-        // *** Order matters. Long names should be checked before short names ***
-        model = when {
-            shortName.startsWith("MRG-B5000") -> WATCH_MODEL.MRG_B5000
-            shortName.startsWith("GCW-B5000") -> WATCH_MODEL.GCW_B5000
-            shortName.startsWith("G-B001") -> WATCH_MODEL.GB001
-            shortName.startsWith("GMW") -> WATCH_MODEL.GMW
-            shortName.startsWith("GST") -> WATCH_MODEL.GST
-            shortName.startsWith("GPR") -> WATCH_MODEL.GPR
-            shortName.startsWith("MSG") -> WATCH_MODEL.MSG
-            shortName.startsWith("GBD") -> WATCH_MODEL.GBD
-            shortName.startsWith("EQB") -> WATCH_MODEL.EQB
-            shortName.startsWith("GMB") -> WATCH_MODEL.GA
-            shortName == "ECB-10" || shortName == "ECB-20" || shortName == "ECB-30" -> WATCH_MODEL.ECB
-            shortName.startsWith("GA") -> WATCH_MODEL.GA
-            shortName.startsWith("GB") -> WATCH_MODEL.GA
-            shortName.startsWith("GW") -> WATCH_MODEL.GW
-            shortName.startsWith("DW") -> WATCH_MODEL.DW
-            else -> WATCH_MODEL.UNKNOWN
-        }
-
-        this.hasReminders = modelMap[model]!!.hasReminders
-        this.hasAutoLight = modelMap[model]!!.hasAutoLight
-        this.alarmCount = modelMap[model]!!.alarmCount
-        this.worldCitiesCount = modelMap[model]!!.worldCitiesCount
-        this.dstCount = modelMap[model]!!.dstCount
-        this.shortLightDuration = modelMap[model]!!.shortLightDuration
-        this.longLightDuration = modelMap[model]!!.longLightDuration
-        this.weekLanguageSupported = modelMap[model]!!.weekLanguageSupported
-        this.worldCities = modelMap[model]!!.worldCities
-        this.hasTemperature = modelMap[model]!!.hasTemperature
-        this.batteryLevelLowerLimit = modelMap[model]!!.batteryLevelLowerLimit
-        this.batteryLevelUpperLimit = modelMap[model]!!.batteryLevelUpperLimit
-        this.alwaysConnected = modelMap[model]!!.alwaysConnected
-        this.findButtonUserDefined = modelMap[model]!!.findButtonUserDefined
-        this.hasPowerSavingMode = modelMap[model]!!.hasPowerSavingMode
-        this.hasBatteryLevel = modelMap[model]!!.hasBatteryLevel
-
-        ProgressEvents.onNext("DeviceName", this.name)
-    }
-
-    fun setAddress(address: String) {
-        this.address = address
-        ProgressEvents.onNext("DeviceAddress", address)
-    }
-
-    fun getAddress(): String {
-        return address
-    }
-
-    fun reset() {
-        this.address = ""
-        this.name = ""
-        this.shortName = ""
-        this.model = WATCH_MODEL.UNKNOWN
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/ble/Connection.kt b/api/src/main/java/org/avmedia/gshockapi/ble/Connection.kt
deleted file mode 100644
index 0eb9db95..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/ble/Connection.kt
+++ /dev/null
@@ -1,126 +0,0 @@
-@file:Suppress("DEPRECATION")
-
-package org.avmedia.gshockapi.ble
-
-import android.annotation.SuppressLint
-import android.bluetooth.BluetoothAdapter
-import android.bluetooth.BluetoothAdapter.getDefaultAdapter
-import android.bluetooth.BluetoothDevice
-import android.bluetooth.BluetoothManager
-import android.content.Context
-import androidx.appcompat.app.AppCompatActivity
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.avmedia.gshockapi.ProgressEvents
-import org.avmedia.gshockapi.WatchInfo
-import org.avmedia.gshockapi.casio.MessageDispatcher
-import timber.log.Timber
-
-object Connection {
-
-    private var bleManager: IGShockManager? = null
-    private val scope = CoroutineScope(Dispatchers.IO)
-
-    private suspend fun connect(device: BluetoothDevice) {
-
-        fun onConnected(name: String, address: String) {
-            WatchInfo.setNameAndModel(name.trimEnd('\u0000'))
-            WatchInfo.setAddress(address)
-            Timber.i("onConnected() end")
-        }
-
-        bleManager?.connect(device) { name: String, address: String -> onConnected(name, address) }
-    }
-
-    fun disconnect() {
-        bleManager?.release()
-    }
-
-    fun close() {
-        bleManager?.close()
-    }
-
-    fun isConnected(): Boolean {
-        return bleManager?.connectionState == ConnectionState.CONNECTED
-    }
-
-    fun isConnecting(): Boolean {
-        return bleManager?.connectionState == ConnectionState.CONNECTING
-    }
-
-    fun teardownConnection(device: BluetoothDevice) {
-        bleManager?.release()
-    }
-
-    fun validateAddress(address: String?): Boolean {
-        return address != null && BluetoothAdapter.checkBluetoothAddress(address)
-    }
-
-    @SuppressLint("NewApi")
-    fun sendMessage(message: String) {
-        MessageDispatcher.sendToWatch(message)
-    }
-
-    fun setDataCallback(dataCallback: IDataReceived) {
-        bleManager?.setDataCallback(dataCallback)
-    }
-
-    fun write(handle: GET_SET_MODE, data: ByteArray) {
-        scope.launch {
-            bleManager?.write(handle, data)
-        }
-    }
-
-    fun startConnection(context: Context, deviceId: String?, deviceName: String?) {
-        scope.launch {
-            if (deviceId.isNullOrEmpty()) {
-                stopBleScan()
-
-                fun onScanCompleted(deviceInfo: GShockScanner.DeviceInfo?) {
-                    scope.launch {
-                        connect(deviceInfo?.address, context)
-                    }
-                }
-
-                GShockScanner.scan(context, ::onScanCompleted)
-            } else {
-                connect(deviceId, context)
-            }
-        }
-    }
-
-    private suspend fun connect(address: String?, context: Context) {
-        if (address.isNullOrEmpty()) {
-            return
-        }
-        val bluetoothAdapter: BluetoothAdapter? = getDefaultAdapter()
-        val device: BluetoothDevice? = bluetoothAdapter?.getRemoteDevice(address)
-        if (device == null) {
-            ProgressEvents.onNext("ApiError", "Cannot obtain remote device")
-            return
-        }
-
-        if (bleManager == null) {
-            bleManager = IGShockManager(context)
-        }
-        connect(device)
-    }
-
-    fun isBluetoothEnabled(context: Context): Boolean {
-        val bluetoothAdapter: BluetoothAdapter by lazy {
-            val bluetoothManager =
-                context.getSystemService(AppCompatActivity.BLUETOOTH_SERVICE) as BluetoothManager
-            bluetoothManager.adapter
-        }
-        return bluetoothAdapter.isEnabled
-    }
-
-    fun stopBleScan() {
-        GShockScanner.cancelFlow()
-    }
-
-    fun breakWait() {
-        bleManager?.release()
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/ble/GShockScanner.kt b/api/src/main/java/org/avmedia/gshockapi/ble/GShockScanner.kt
deleted file mode 100644
index a10f2b5a..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/ble/GShockScanner.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.avmedia.gshockapi.ble
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.os.ParcelUuid
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.cancellable
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onCompletion
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.onEmpty
-import kotlinx.coroutines.flow.onStart
-import no.nordicsemi.android.kotlin.ble.core.ServerDevice
-import no.nordicsemi.android.kotlin.ble.core.scanner.BleNumOfMatches
-import no.nordicsemi.android.kotlin.ble.core.scanner.BleScanFilter
-import no.nordicsemi.android.kotlin.ble.core.scanner.BleScanMode
-import no.nordicsemi.android.kotlin.ble.core.scanner.BleScannerMatchMode
-import no.nordicsemi.android.kotlin.ble.core.scanner.BleScannerSettings
-import no.nordicsemi.android.kotlin.ble.core.scanner.FilteredServiceUuid
-import no.nordicsemi.android.kotlin.ble.scanner.BleScanner
-import org.avmedia.gshockapi.ProgressEvents
-
-object GShockScanner {
-    @SuppressLint("MissingPermission")
-    val CASIO_SERVICE_UUID = "00001804-0000-1000-8000-00805f9b34fb"
-
-    data class DeviceInfo(val name: String, val address: String)
-
-    private lateinit var scannerFlow: Job
-    var scannedName = ""
-
-    @SuppressLint("MissingPermission")
-    suspend fun scan(
-        context: Context,
-        scanCallback: (DeviceInfo?) -> Unit
-    ) {
-        val gShockFilters: List<BleScanFilter> = listOf(
-            BleScanFilter(serviceUuid = FilteredServiceUuid(ParcelUuid.fromString(CASIO_SERVICE_UUID)))
-        )
-
-        val gShockSettings = BleScannerSettings(
-            includeStoredBondedDevices = false,
-            numOfMatches = BleNumOfMatches.MATCH_NUM_ONE_ADVERTISEMENT,
-            matchMode = BleScannerMatchMode.MATCH_MODE_AGGRESSIVE,
-            scanMode = BleScanMode.SCAN_MODE_LOW_LATENCY,
-        )
-
-        val scope = CoroutineScope(Dispatchers.IO)
-        val deviceSet = mutableSetOf<String>()
-        cancelFlow()
-
-        scannerFlow = BleScanner(context).scan(filters = gShockFilters, settings = gShockSettings)
-            .filter {
-                val device: ServerDevice = it.device
-                val ret = (device.name as String).startsWith("CASIO")
-                ret
-            }
-            .onStart {
-                ProgressEvents.onNext("BLE Scanning Started")
-            }
-            .onEmpty {
-                ProgressEvents.onNext("ApiError", "No devices found while scanning")
-            }
-            .onCompletion {
-                ProgressEvents.onNext("BLE Scanning Completed")
-            }
-            .onEach {
-                val device = it.device
-                if (device.address !in deviceSet) {
-                    deviceSet.add(device.address)
-                    scannedName = (device.name as String)
-                    scanCallback(DeviceInfo(device.name as String, device.address))
-                    cancelFlow()
-                }
-            }
-            .cancellable()
-            .catch { e ->
-                ProgressEvents.onNext("ApiError", "BLE Scanning Error $e")
-            }
-            .launchIn(scope)
-    }
-
-    fun cancelFlow() {
-        if (::scannerFlow.isInitialized) {
-            scannerFlow.cancel()
-        }
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/ble/IDataReceived.kt b/api/src/main/java/org/avmedia/gshockapi/ble/IDataReceived.kt
deleted file mode 100644
index 3e8d1a19..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/ble/IDataReceived.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Created by Ivo Zivkov (izivkov@gmail.com) on 2022-03-30, 12:06 a.m.
- * Copyright (c) 2022 . All rights reserved.
- * Last modified 2022-03-14, 1:48 p.m.
- */
-
-package org.avmedia.gshockapi.ble
-
-interface IDataReceived {
-    fun dataReceived(data: String?)
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/ble/IGShockManager.kt b/api/src/main/java/org/avmedia/gshockapi/ble/IGShockManager.kt
deleted file mode 100644
index e68a7ce8..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/ble/IGShockManager.kt
+++ /dev/null
@@ -1,243 +0,0 @@
-package org.avmedia.gshockapi.ble
-
-import android.annotation.SuppressLint
-import android.bluetooth.BluetoothDevice
-import android.bluetooth.BluetoothGatt
-import android.bluetooth.BluetoothGattCharacteristic
-import android.content.Context
-import android.os.Build
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.cancel
-import no.nordicsemi.android.ble.BleManager
-import no.nordicsemi.android.ble.observer.ConnectionObserver
-import org.avmedia.gshockapi.ProgressEvents
-import org.avmedia.gshockapi.casio.CasioConstants
-import timber.log.Timber
-
-enum class ConnectionState {
-    CONNECTING, CONNECTED, DISCONNECTED, DISCONNECTING
-}
-
-typealias onConnectedType = (String, String) -> Unit
-
-enum class GET_SET_MODE {
-    GET,
-    SET
-}
-
-interface GSHock {
-    suspend fun connect(device: BluetoothDevice, onConnected: (String, String) -> Unit)
-    fun release()
-    fun close()
-    fun setDataCallback(dataCallback: IDataReceived?)
-    fun enableNotifications()
-    var connectionState: ConnectionState
-    suspend fun write(handle: GET_SET_MODE, data: ByteArray)
-}
-
-class IGShockManager(
-    context: Context,
-) : GSHock by GShockManagerImpl(context)
-
-private class GShockManagerImpl(
-    context: Context,
-) : BleManager(context), GSHock {
-
-    private lateinit var readCharacteristicHolder: BluetoothGattCharacteristic
-    private lateinit var writeCharacteristicHolder: BluetoothGattCharacteristic
-    var dataReceivedCallback: IDataReceived? = null
-    private lateinit var device: BluetoothDevice
-    override var connectionState = ConnectionState.DISCONNECTED
-    private lateinit var onConnected: onConnectedType
-
-    init {
-        connectionObserver = ConnectionEventHandler()
-    }
-
-    override fun initialize() {
-        super.initialize()
-        setNotificationCallback(writeCharacteristicHolder).with { _, data ->
-
-            fun ByteArray.toHexString(): String =
-                joinToString(separator = " ", prefix = "0x") { String.format("%02X", it) }
-
-            val hexData = data.value?.toHexString()
-            Timber.i("Received data: $hexData")
-
-            dataReceivedCallback?.dataReceived(hexData)
-        }
-
-        enableNotifications(writeCharacteristicHolder).enqueue()
-        ProgressEvents.onNext("BleManagerInitialized")
-    }
-
-    @SuppressLint("MissingPermission")
-    private val scope = CoroutineScope(Dispatchers.IO)
-
-    override suspend fun connect(device: BluetoothDevice, onConnected: onConnectedType) {
-        this.onConnected = onConnected
-
-        connect(device)
-            .retry(3, 100)
-            .useAutoConnect(true)
-            .done {
-                requestMtu(256).enqueue()
-                Timber.d("BLE", "Connected with autoConnect!")
-            }
-            .fail { _, status -> Timber.d("BLE", "Failed with status $status") }
-            .enqueue()
-    }
-
-    override fun close() {
-        super.close()
-    }
-
-    override fun release() {
-        connectionState = ConnectionState.DISCONNECTING
-
-        // Cancel all coroutines.
-        scope.cancel()
-
-        val wasConnected = isReady
-        // If the device wasn't connected, it means that ConnectRequest was still pending.
-        // Cancelling queue will initiate disconnecting automatically.
-        cancelQueue()
-
-        // If the device was connected, we have to disconnect manually.
-        if (wasConnected) {
-            disconnect().enqueue()
-        }
-    }
-
-    override fun setDataCallback(dataCallback: IDataReceived?) {
-        dataReceivedCallback = dataCallback
-    }
-
-    override fun enableNotifications() {
-        enableNotifications(writeCharacteristicHolder)
-            .fail { _, status ->
-                // Handle failure to enable notifications
-                Timber.i("Failed to enable notifications. Status: $status")
-                ProgressEvents.onNext("ApiError")
-            }
-            .done { device ->
-                // Notifications enabled successfully
-                ProgressEvents.onNext("NotificationsEnabled", device)
-            }
-            .enqueue()
-    }
-
-    // Connection events
-    inner class ConnectionEventHandler : ConnectionObserver {
-        override fun onDeviceConnecting(device: BluetoothDevice) {
-            Timber.i("$device onDeviceConnecting!!!!!!")
-            connectionState = ConnectionState.CONNECTING
-        }
-
-        @SuppressLint("MissingPermission")
-        override fun onDeviceConnected(device: BluetoothDevice) {
-            ProgressEvents.onNext("ConnectionStarted")
-            connectionState = ConnectionState.CONNECTED
-        }
-
-        override fun onDeviceFailedToConnect(device: BluetoothDevice, reason: Int) {
-            ProgressEvents.onNext("ConnectionFailed")
-            connectionState = ConnectionState.DISCONNECTED
-        }
-
-        @SuppressLint("MissingPermission")
-        override fun onDeviceReady(device: BluetoothDevice) {
-            Timber.i("$device DeviceReady!!!!!!")
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                device.createBond()
-            }
-
-            if (device.name == null) {
-                ProgressEvents.onNext("ApiError", "Cannot obtain device name")
-                return
-            }
-
-            val name = device.name ?: "CASIO"
-            onConnected(name, device.address)
-
-            // inform the caller that we have connected
-            ProgressEvents.onNext("DeviceName", name)
-            ProgressEvents.onNext("DeviceAddress", device.address)
-            ProgressEvents.onNext("ConnectionSetupComplete", device)
-
-            Timber.i("onDeviceReady: Sent all messages.")
-        }
-
-        override fun onDeviceDisconnecting(device: BluetoothDevice) {
-            Timber.i("$device onDeviceDisconnecting!!!!!!")
-            connectionState = ConnectionState.DISCONNECTING
-        }
-
-        override fun onDeviceDisconnected(device: BluetoothDevice, reason: Int) {
-            ProgressEvents.onNext("Disconnect", device)
-            connectionState = ConnectionState.DISCONNECTED
-        }
-    }
-
-    @SuppressLint("NewApi", "MissingPermission")
-    override fun isRequiredServiceSupported(gatt: BluetoothGatt): Boolean {
-        gatt.getService(CasioConstants.WATCH_FEATURES_SERVICE_UUID)?.apply {
-            readCharacteristicHolder = getCharacteristic(
-                CasioConstants.CASIO_READ_REQUEST_FOR_ALL_FEATURES_CHARACTERISTIC_UUID,
-            )
-
-            writeCharacteristicHolder = getCharacteristic(
-                CasioConstants.CASIO_ALL_FEATURES_CHARACTERISTIC_UUID,
-            )
-            return true
-        }
-        return false
-    }
-
-    /*
-    I/BleExtensionsKt: Service 00001801-0000-1000-8000-00805f9b34fb
-    Characteristics:
-    |--
-    I/BleExtensionsKt: Service 00001800-0000-1000-8000-00805f9b34fb
-    Characteristics:
-    |--00002a00-0000-1000-8000-00805f9b34fb: READABLE
-    |--00002a01-0000-1000-8000-00805f9b34fb: READABLE
-    I/BleExtensionsKt: Service 00001804-0000-1000-8000-00805f9b34fb
-    Characteristics:
-    |--00002a07-0000-1000-8000-00805f9b34fb: READABLE
-    I/BleExtensionsKt: Service 26eb000d-b012-49a8-b1f8-394fb2032b0f
-    Characteristics:
-    |--26eb002c-b012-49a8-b1f8-394fb2032b0f: WRITABLE WITHOUT RESPONSE
-    |--26eb002d-b012-49a8-b1f8-394fb2032b0f: WRITABLE, NOTIFIABLE
-    |------00002902-0000-1000-8000-00805f9b34fb: EMPTY
-    |--26eb0023-b012-49a8-b1f8-394fb2032b0f: WRITABLE, NOTIFIABLE
-    |------00002902-0000-1000-8000-00805f9b34fb: EMPTY
-    |--26eb0024-b012-49a8-b1f8-394fb2032b0f: WRITABLE WITHOUT RESPONSE, NOTIFIABLE
-    |------00002902-0000-1000-8000-00805f9b34fb: EMPTY
-    */
-
-    override suspend fun write(handle: GET_SET_MODE, data: ByteArray) {
-
-        if (!this::readCharacteristicHolder.isInitialized || !this::writeCharacteristicHolder.isInitialized) {
-            ProgressEvents.onNext("ApiError", "Connection failed. Please try again.")
-            disconnect()
-            return
-        }
-
-        val characteristic =
-            if (handle == GET_SET_MODE.GET) readCharacteristicHolder else writeCharacteristicHolder
-        val writeType =
-            if (handle == GET_SET_MODE.GET) BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE else BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT
-
-        writeCharacteristic(
-            characteristic,
-            data,
-            writeType
-        ).enqueue()
-    }
-}
-
-
-
diff --git a/api/src/main/java/org/avmedia/gshockapi/casio/Alarms.kt b/api/src/main/java/org/avmedia/gshockapi/casio/Alarms.kt
deleted file mode 100644
index a1f024ab..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/casio/Alarms.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Created by Ivo Zivkov (izivkov@gmail.com) on 2022-03-30, 12:06 a.m.
- * Copyright (c) 2022 . All rights reserved.
- * Last modified 2022-03-27, 9:45 a.m.
- */
-
-package org.avmedia.gshockapi.casio
-
-import com.google.gson.Gson
-import org.avmedia.gshockapi.utils.Utils
-import org.json.JSONArray
-import org.json.JSONObject
-
-object Alarms {
-
-    private const val HOURLY_CHIME_MASK = 0b10000000
-    const val ENABLED_MASK = 0b01000000
-
-    private const val ALARM_CONSTANT_VALUE = 0x40
-
-    class Alarm(val hour: Int, val minute: Int, val enabled: Boolean, val hasHourlyChime: Boolean)
-
-    fun fromJsonAlarmFirstAlarm(alarmJson: JSONObject): ByteArray {
-        val gson = Gson()
-        val alarm: Alarm = gson.fromJson(alarmJson.toString(), Alarm::class.java)
-
-        return createFirstAlarm(alarm)
-    }
-
-    private fun createFirstAlarm(alarm: Alarm): ByteArray {
-
-        var flag = 0
-        if (alarm.enabled) flag = flag or ENABLED_MASK
-        if (alarm.hasHourlyChime) flag = flag or HOURLY_CHIME_MASK
-
-        return Utils.byteArrayOfInts(
-            CasioConstants.CHARACTERISTICS.CASIO_SETTING_FOR_ALM.code,
-            flag,
-            ALARM_CONSTANT_VALUE,
-            alarm.hour,
-            alarm.minute
-        )
-    }
-
-    fun fromJsonAlarmSecondaryAlarms(alarmsJson: JSONArray): ByteArray {
-        if (alarmsJson.length() < 2) {
-            return ByteArray(0)
-        }
-        val gson = Gson()
-        val allAlarms: Array<Alarm> = gson.fromJson(alarmsJson.toString(), Array<Alarm>::class.java)
-        // ignore the first alarm
-        val alarms = allAlarms.toList().subList(1, allAlarms.size)
-        return createSecondaryAlarm(alarms)
-    }
-
-    private fun createSecondaryAlarm(alarms: List<Alarm>): ByteArray {
-        var allAlarms =
-            Utils.byteArrayOfInts(CasioConstants.CHARACTERISTICS.CASIO_SETTING_FOR_ALM2.code)
-
-        for (alarm in alarms) {
-            var flag = 0
-            if (alarm.enabled) flag = flag or ENABLED_MASK
-            if (alarm.hasHourlyChime) flag = flag or HOURLY_CHIME_MASK
-
-            allAlarms += Utils.byteArrayOfInts(
-                flag,
-                ALARM_CONSTANT_VALUE,
-                alarm.hour,
-                alarm.minute
-            )
-        }
-
-        return allAlarms
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/casio/CasioConstants.kt b/api/src/main/java/org/avmedia/gshockapi/casio/CasioConstants.kt
deleted file mode 100644
index 41bd745d..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/casio/CasioConstants.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Created by Ivo Zivkov (izivkov@gmail.com) on 2022-03-30, 12:06 a.m.
- * Copyright (c) 2022 . All rights reserved.
- * Last modified 2022-03-27, 9:52 a.m.
- */
-package org.avmedia.gshockapi.casio
-
-import java.util.UUID
-
-object CasioConstants {
-
-    val WATCH_FEATURES_SERVICE_UUID: UUID =
-        UUID.fromString("26eb000d-b012-49a8-b1f8-394fb2032b0f")
-
-    // Modern Watches - All Features
-    val CASIO_READ_REQUEST_FOR_ALL_FEATURES_CHARACTERISTIC_UUID: UUID =
-        UUID.fromString("26eb002c-b012-49a8-b1f8-394fb2032b0f")
-
-    val CASIO_ALL_FEATURES_CHARACTERISTIC_UUID: UUID =
-        UUID.fromString("26eb002d-b012-49a8-b1f8-394fb2032b0f")
-
-    enum class CHARACTERISTICS(val code: Int) {
-        CASIO_WATCH_NAME(0x23),
-        CASIO_APP_INFORMATION(0x22),
-        CASIO_BLE_FEATURES(0x10),
-        CASIO_SETTING_FOR_BLE(0x11),
-        CASIO_WATCH_CONDITION(0x28), // battery %
-        CASIO_DST_WATCH_STATE(0x1d),
-        CASIO_DST_SETTING(0x1e),
-        CASIO_CURRENT_TIME(0x09),
-        CASIO_SETTING_FOR_ALM(0x15),
-        CASIO_SETTING_FOR_ALM2(0x16),
-        CASIO_SETTING_FOR_BASIC(0x13),
-        CASIO_CURRENT_TIME_MANAGER(0x39),
-        CASIO_WORLD_CITIES(0x1f),
-        CASIO_REMINDER_TITLE(0x30),
-        CASIO_REMINDER_TIME(0x31),
-        CASIO_TIMER(0x18),
-        ERROR(0xFF),
-
-        // ECB-30
-        CMD_SET_TIMEMODE(0x47),
-        FIND_PHONE(0x0A),
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/casio/CasioTimeZoneHelper.kt b/api/src/main/java/org/avmedia/gshockapi/casio/CasioTimeZoneHelper.kt
deleted file mode 100644
index 90ba770f..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/casio/CasioTimeZoneHelper.kt
+++ /dev/null
@@ -1,209 +0,0 @@
-package org.avmedia.gshockapi.casio
-
-import android.os.Build
-import androidx.annotation.RequiresApi
-import java.time.Duration
-import java.time.Instant
-import java.time.ZoneId
-import java.time.ZonedDateTime
-import java.time.zone.ZoneOffsetTransition
-
-/*
-From Gadgetbridge project:
-
-There are six clocks on the Casio GW-B5600
-0 is the main clock
-1-5 are the world clocks
-
-0x1d 00 01 DST0 DST1 TZ0A TZ0B TZ1A TZ1B ff ff ff ff ff
-0x1d 02 03 DST2 DST3 TZ2A TZ2B TZ3A TZ3B ff ff ff ff ff
-0x1d 04 05 DST4 DST5 TZ4A TZ4B TZ5A TZ5B ff ff ff ff ff
-DST: bitwise flags; bit0: DST on, bit1: DST auto
-
-0x1e 0-5 TZ_A TZ_B TZ_OFF TZ_DSTOFF TZ_DSTRULES
-A/B seem to be ignored by the watch
-OFF & DSTOFF in 15 minute intervals
-
-0x1f 0-5 (18 bytes ASCII TZ name)
-
-Timezones selectable on the watch:
-                   A  B   OFF DSTOFF DSTRULES
-BAKER ISLAND       39 01  D0  04     00
-PAGO PAGO          D7 00  D4  04     00
-HONOLULU           7B 00  D8  04     00
-MARQUESAS ISLANDS  3A 01  DA  04     00
-ANCHORAGE          0C 00  DC  04     01
-LOS ANGELES        A1 00  E0  04     01
-DENVER             54 00  E4  04     01
-CHICAGO            42 00  E8  04     01
-NEW YORK           CA 00  EC  04     01
-HALIFAX            71 00  F0  04     01
-ST.JOHN'S          0C 01  F2  04     01
-RIO DE JANEIRO     F1 00  F4  04     00
-F.DE NORONHA       62 00  F8  04     00
-PRAIA              E9 00  FC  04     00
-UTC                00 00  00  00     00
-LONDON             A0 00  00  04     02
-PARIS              DC 00  04  04     02
-ATHENS             13 00  08  04     02
-JEDDAH             85 00  0C  04     00
-TEHRAN             16 01  0E  04     2B
-DUBAI              5B 00  10  04     00
-KABUL              88 00  12  04     00
-KARACHI            8B 00  14  04     00
-DELHI              52 00  16  04     00
-KATHMANDU          8C 00  17  04     00
-DHAKA              56 00  18  04     00
-YANGON             2F 01  1A  04     00
-BANGKOK            1C 00  1C  04     00
-HONG KONG          7A 00  20  04     00
-PYONGYANG          EA 00  24  04     00
-EUCLA              36 01  23  04     00
-TOKYO              19 01  24  04     00
-ADELAIDE           05 00  26  04     04
-SYDNEY             0F 01  28  04     04
-LORD HOWE ISLAND   37 01  2A  02     12
-NOUMEA             CD 00  2C  04     00
-WELLINGTON         2B 01  30  04     05
-CHATHAM ISLANDS    3F 00  33  04     17
-NUKUALOFA          D0 00  34  04     00
-KIRITIMATI         93 00  38  04     00
-
-JERUSALEM          86 00  08  04     2A
-CASABLANCA         3A 00  00  04     0F
-BEIRUT             22 00  08  04     0C
-NORFOLK ISLAND     38 01  2C  04     04
-EASTER ISLAND      5E 00  E8  04     1C
-HAVANA             75 00  EC  04     15
-SANTIAGO           02 01  F0  04     1B
-ASUNCION           12 00  F0  04     09
-PONTA DELGADA      E4 00  FC  04     02
-*/
-
-@RequiresApi(Build.VERSION_CODES.O)
-object CasioTimeZoneHelper {
-    class CasioTimeZone(val name: String, val zoneName: String, private val _dstRules: Int = 0) {
-        val zoneId: ZoneId = ZoneId.of(zoneName)
-        val dstOffset = getDTSDuration().seconds / 60 / 15
-        val offset = zoneId.rules.getStandardOffset(Instant.now()).totalSeconds / 60 / 15
-
-        // If we have no DST for this timezone, override the dstRules with a 0,
-        // since the Casio table might be outdated, i.e for TEHRAN.
-
-        val dstRules = adjustRules(dstOffset, _dstRules)
-
-        fun isInDST(): Boolean {
-            val now = ZonedDateTime.now(zoneId)
-            return zoneId.rules.isDaylightSavings(now.toInstant())
-        }
-
-        fun hasDST() = dstOffset > 0
-        fun hasRules() = dstRules != 0
-
-        private fun adjustRules(dstOffset: Long, dstRules: Int) =
-            if (dstOffset == 0L) 0 else dstRules
-
-        private fun getDTSDuration(): Duration {
-            val rules = zoneId.rules ?: return Duration.ZERO
-            val now = Instant.now()
-            val next: ZoneOffsetTransition = rules.nextTransition(now) ?: return Duration.ZERO
-            return Duration.ofSeconds(
-                rules.getDaylightSavings(
-                    if (rules.isDaylightSavings(now)) now else next.instant?.plusSeconds(1)
-                ).seconds
-            )
-        }
-
-        override fun toString(): String {
-            return "CasioTimeZone(name='$name', zoneName='$zoneName', zoneId=$zoneId, dstOffset=$dstOffset, offset=$offset, dstRules: $dstRules)"
-        }
-    }
-
-    private val timeZoneTable = arrayOf(
-        CasioTimeZone("BAKER ISLAND", "UTC-12"),
-        CasioTimeZone("MARQUESAS ISLANDS", "Pacific/Marquesas", 0xDA),
-        CasioTimeZone("POGO POGO", "Pacific/Pago_Pago"),
-        CasioTimeZone("HONOLULU", "Pacific/Honolulu"),
-        CasioTimeZone("ANCHORAGE", "America/Anchorage", 0x1),
-        CasioTimeZone("LOS ANGELES", "America/Los_Angeles", 0x1),
-        CasioTimeZone("DENVER", "America/Denver", 0x1),
-        CasioTimeZone("CHICAGO", "America/Chicago", 0x1),
-        CasioTimeZone("NEW YORK", "America/New_York", 0x1),
-        CasioTimeZone("HALIFAX", "America/Halifax", 0x1),
-        CasioTimeZone("ST.JOHN'S", "America/St_Johns", 0x1),
-        CasioTimeZone("RIO DE JANEIRO", "America/Sao_Paulo"),
-        CasioTimeZone("F.DE NORONHA", "America/Noronha"),
-        CasioTimeZone("PRAIA", "Atlantic/Cape_Verde"),
-        CasioTimeZone("UTC", "UTC"),
-        CasioTimeZone("LONDON", "Europe/London", 0x02),
-        CasioTimeZone("PARIS", "Europe/Paris", 0x02),
-        CasioTimeZone("ATHENS", "Europe/Athens", 0x02),
-        CasioTimeZone("JEDDAH", "Asia/Riyadh", 0x0),
-        CasioTimeZone("JERUSALEM", "Asia/Jerusalem", 0x2A),
-        CasioTimeZone("TEHRAN", "Asia/Tehran", 0x2B),
-        CasioTimeZone("DUBAI", "Asia/Dubai"),
-        CasioTimeZone("KABUL", "Asia/Kabul"),
-        CasioTimeZone("KARACHI", "Asia/Karachi"),
-        CasioTimeZone("DELHI", "Asia/Kolkata"),
-        CasioTimeZone("KATHMANDU", "Asia/Kathmandu"),
-        CasioTimeZone("DHAKA", "Asia/Dhaka"),
-        CasioTimeZone("YANGON", "Asia/Yangon"),
-        CasioTimeZone("BANGKOK", "Asia/Bangkok"),
-        CasioTimeZone("HONG KONG", "Asia/Hong_Kong"),
-        CasioTimeZone("PYONGYANG", "Asia/Pyongyang"),
-        CasioTimeZone("EUCLA", "Australia/Eucla"),
-        CasioTimeZone("TOKYO", "Asia/Tokyo"),
-        CasioTimeZone("ADELAIDE", "Australia/Adelaide", 0x4),
-        CasioTimeZone("SYDNEY", "Australia/Sydney", 0x4),
-        CasioTimeZone("LORD HOWE ISLAND", "Australia/Lord_Howe", 0x12),
-        CasioTimeZone("NOUMEA", "Pacific/Noumea"),
-        CasioTimeZone("WELLINGTON", "Pacific/Auckland", 0x5),
-        CasioTimeZone("CHATHAM ISLANDS", "Pacific/Chatham", 0x17),
-        CasioTimeZone("NUKUALOFA", "Pacific/Tongatapu"),
-        CasioTimeZone("KIRITIMATI", "Pacific/Kiritimati"),
-        CasioTimeZone("JERUSALEM", "Asia/Jerusalem", 0x2A),
-        CasioTimeZone("CASABLANCA", "Africa/Casablanca", 0x0f),
-        CasioTimeZone("BEIRUT", "Asia/Beirut", 0x0C),
-        CasioTimeZone("NORFOLK ISLAND", "Pacific/Norfolk", 0x04),
-        CasioTimeZone("EASTER ISLAND", "Pacific/Easter", 0x1C),
-        CasioTimeZone("HAVANA", "America/Havana", 0x15),
-        CasioTimeZone("SANTIAGO", "America/Santiago", 0x1B),
-        CasioTimeZone("ASUNCION", "America/Asuncion", 0x09),
-        CasioTimeZone("PONTA DELGADA", "Atlantic/Azores", 0x02),
-    )
-
-    val timeZoneMap by lazy {
-        timeZoneTable.associateBy { it.zoneName }.toMap()
-    }
-
-    private fun isEquivalent(tz1: ZoneId, tz2: ZoneId): Boolean {
-        val rules1 = tz1.normalized().rules
-        val rules2 = tz2.normalized().rules
-
-        return rules1.getStandardOffset(Instant.now())
-            .equals(rules2.getStandardOffset(Instant.now())) && rules1.getDaylightSavings(Instant.now())
-            .equals(rules1.getDaylightSavings(Instant.now())) && rules1.transitionRules.equals(
-            rules2.transitionRules
-        )
-    }
-
-    fun findTimeZone(timeZoneName: String): CasioTimeZone {
-
-        var foundEntry = timeZoneMap[timeZoneName]
-        if (foundEntry != null) {
-            return foundEntry
-        }
-
-        for (entry in timeZoneMap.values) {
-            if (isEquivalent(entry.zoneId, ZoneId.of(timeZoneName))) {
-                return entry
-            }
-        }
-
-        // Sometimes, text comes as "LON:LONDON". Get the last part.
-        // val name = timeZoneName.split("/").lastOrNull()?.split(":")?.lastOrNull()?.uppercase() ?: "UNKNOWN"
-
-        val name = timeZoneName.split("/").lastOrNull()?.uppercase() ?: "UNKNOWN"
-        return CasioTimeZone(name, timeZoneName, 0x00)
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/casio/MessageDispatcher.kt b/api/src/main/java/org/avmedia/gshockapi/casio/MessageDispatcher.kt
deleted file mode 100644
index 2d06b223..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/casio/MessageDispatcher.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Created by Ivo Zivkov (izivkov@gmail.com) on 2022-03-30, 12:06 a.m.
- * Copyright (c) 2022 . All rights reserved.
- * Last modified 2022-03-29, 10:02 a.m.
- */
-
-package org.avmedia.gshockapi.casio
-
-import android.os.Build
-import androidx.annotation.RequiresApi
-import org.avmedia.gshockapi.io.AlarmsIO
-import org.avmedia.gshockapi.io.AppInfoIO
-import org.avmedia.gshockapi.io.ButtonPressedIO
-import org.avmedia.gshockapi.io.DstForWorldCitiesIO
-import org.avmedia.gshockapi.io.DstWatchStateIO
-import org.avmedia.gshockapi.io.ErrorIO
-import org.avmedia.gshockapi.io.EventsIO
-import org.avmedia.gshockapi.io.RunActionsIO
-import org.avmedia.gshockapi.io.SettingsIO
-import org.avmedia.gshockapi.io.TimeAdjustmentIO
-import org.avmedia.gshockapi.io.TimeIO
-import org.avmedia.gshockapi.io.TimerIO
-import org.avmedia.gshockapi.io.UnknownIO
-import org.avmedia.gshockapi.io.WatchConditionIO
-import org.avmedia.gshockapi.io.WatchNameIO
-import org.avmedia.gshockapi.io.WorldCitiesIO
-import org.avmedia.gshockapi.utils.Utils
-import org.json.JSONObject
-import timber.log.Timber
-
-object MessageDispatcher {
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private val watchSenders = mapOf<String, (String) -> Unit>(
-        "GET_ALARMS" to AlarmsIO::sendToWatch,
-        "SET_ALARMS" to AlarmsIO::sendToWatchSet,
-        "SET_REMINDERS" to EventsIO::sendToWatchSet,
-        "GET_SETTINGS" to SettingsIO::sendToWatch,
-        "SET_SETTINGS" to SettingsIO::sendToWatchSet,
-        "GET_TIME_ADJUSTMENT" to TimeAdjustmentIO::sendToWatch,
-        "SET_TIME_ADJUSTMENT" to TimeAdjustmentIO::sendToWatchSet,
-        "GET_TIMER" to TimerIO::sendToWatch,
-        "SET_TIMER" to TimerIO::sendToWatchSet,
-        "SET_TIME" to TimeIO::sendToWatchSet,
-    )
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    fun sendToWatch(message: String) {
-        val action = JSONObject(message).get("action")
-        watchSenders[action]!!.invoke(message)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private val dataReceivedMessages = mapOf<Int, (String) -> Unit>(
-        CasioConstants.CHARACTERISTICS.CASIO_SETTING_FOR_ALM.code to AlarmsIO::onReceived,
-        CasioConstants.CHARACTERISTICS.CASIO_SETTING_FOR_ALM2.code to AlarmsIO::onReceived,
-        CasioConstants.CHARACTERISTICS.CASIO_DST_SETTING.code to DstForWorldCitiesIO::onReceived,
-        CasioConstants.CHARACTERISTICS.CASIO_REMINDER_TIME.code to EventsIO::onReceived,
-        CasioConstants.CHARACTERISTICS.CASIO_REMINDER_TITLE.code to EventsIO::onReceivedTitle,
-        CasioConstants.CHARACTERISTICS.CASIO_TIMER.code to TimerIO::onReceived,
-        CasioConstants.CHARACTERISTICS.CASIO_WORLD_CITIES.code to WorldCitiesIO::onReceived,
-        CasioConstants.CHARACTERISTICS.CASIO_DST_WATCH_STATE.code to DstWatchStateIO::onReceived,
-        CasioConstants.CHARACTERISTICS.CASIO_WATCH_NAME.code to WatchNameIO::onReceived,
-        CasioConstants.CHARACTERISTICS.CASIO_WATCH_CONDITION.code to WatchConditionIO::onReceived,
-        CasioConstants.CHARACTERISTICS.CASIO_APP_INFORMATION.code to AppInfoIO::onReceived,
-        CasioConstants.CHARACTERISTICS.CASIO_BLE_FEATURES.code to ButtonPressedIO::onReceived,
-        CasioConstants.CHARACTERISTICS.CASIO_SETTING_FOR_BASIC.code to SettingsIO::onReceived,
-        CasioConstants.CHARACTERISTICS.CASIO_SETTING_FOR_BLE.code to TimeAdjustmentIO::onReceived,
-
-        CasioConstants.CHARACTERISTICS.ERROR.code to ErrorIO::onReceived,
-        CasioConstants.CHARACTERISTICS.FIND_PHONE.code to RunActionsIO::onReceived, // always-connected watches, use PHONE FINDER to invoke actions...
-        CasioConstants.CHARACTERISTICS.CMD_SET_TIMEMODE.code to UnknownIO::onReceived,
-    )
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    fun onReceived(data: String) {
-        val intArray = Utils.toIntArray(data)
-        val key = intArray[0]
-        if (dataReceivedMessages[key] == null) {
-            Timber.e("GShockAPI", "Unknown key: $key")
-        }
-        dataReceivedMessages[key]?.invoke(data)
-    }
-}
diff --git a/api/src/main/java/org/avmedia/gshockapi/casio/ReminderMasks.kt b/api/src/main/java/org/avmedia/gshockapi/casio/ReminderMasks.kt
deleted file mode 100644
index f4cabee6..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/casio/ReminderMasks.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.avmedia.gshockapi.casio
-
-class ReminderMasks {
-    companion object {
-        const val YEARLY_MASK = 0b00001000
-        const val MONTHLY_MASK = 0b00010000
-        const val WEEKLY_MASK = 0b00000100
-
-        const val SUNDAY_MASK = 0b00000001
-        const val MONDAY_MASK = 0b00000010
-        const val TUESDAY_MASK = 0b00000100
-        const val WEDNESDAY_MASK = 0b00001000
-        const val THURSDAY_MASK = 0b00010000
-        const val FRIDAY_MASK = 0b00100000
-        const val SATURDAY_MASK = 0b01000000
-
-        const val ENABLED_MASK = 0b00000001
-    }
-}
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/AlarmsIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/AlarmsIO.kt
deleted file mode 100644
index 6cec308c..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/AlarmsIO.kt
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import CachedIO
-import android.os.Build
-import androidx.annotation.RequiresApi
-import com.google.gson.Gson
-import kotlinx.coroutines.CompletableDeferred
-import org.avmedia.gshockapi.Alarm
-import org.avmedia.gshockapi.ble.Connection
-import org.avmedia.gshockapi.ble.GET_SET_MODE
-import org.avmedia.gshockapi.casio.Alarms
-import org.avmedia.gshockapi.casio.CasioConstants
-import org.avmedia.gshockapi.utils.Utils
-import org.json.JSONArray
-import org.json.JSONObject
-import timber.log.Timber
-
-@RequiresApi(Build.VERSION_CODES.O)
-object AlarmsIO {
-
-    private object DeferredValueHolder {
-        lateinit var deferredResult: CompletableDeferred<ArrayList<Alarm>>
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    suspend fun request(): ArrayList<Alarm> {
-        return CachedIO.request("GET_ALARMS") { key ->
-            getAlarms(key)
-        }
-    }
-
-    private suspend fun getAlarms(key: String): ArrayList<Alarm> {
-        DeferredValueHolder.deferredResult = CompletableDeferred()
-        Alarm.clear()
-        Connection.sendMessage("{ action: '$key'}")
-
-        return DeferredValueHolder.deferredResult.await()
-    }
-
-    fun set(alarms: ArrayList<Alarm>) {
-        if (alarms.isEmpty()) {
-            Timber.d("Alarm model not initialised! Cannot set alarm")
-            return
-        }
-
-        @Synchronized
-        fun toJson(): String {
-            val gson = Gson()
-            return gson.toJson(alarms)
-        }
-
-        fun setFunc() {
-            Connection.sendMessage("{action: \"SET_ALARMS\", value: ${toJson()} }")
-        }
-        CachedIO.set("SET_ALARMS") {
-            setFunc()
-        }
-    }
-
-    fun onReceived(data: String) {
-
-        fun fromJson(jsonStr: String) {
-            val gson = Gson()
-            val alarmArr = gson.fromJson(jsonStr, Array<Alarm>::class.java)
-            Alarm.addSorted(alarmArr)
-        }
-
-        val decoded = AlarmDecoder.toJson(data).get("ALARMS")
-        fromJson(decoded.toString())
-
-        if (Alarm.alarms.size == 5) {
-            DeferredValueHolder.deferredResult.complete(Alarm.alarms)
-        }
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    fun sendToWatch(message: String) {
-        // get alarm 1
-        IO.writeCmd(
-            GET_SET_MODE.GET,
-            Utils.byteArray(CasioConstants.CHARACTERISTICS.CASIO_SETTING_FOR_ALM.code.toByte())
-        )
-
-        // get the rest of the alarms
-        IO.writeCmd(
-            GET_SET_MODE.GET,
-            Utils.byteArray(CasioConstants.CHARACTERISTICS.CASIO_SETTING_FOR_ALM2.code.toByte())
-        )
-    }
-
-    fun sendToWatchSet(message: String) {
-        val alarmsJsonArr: JSONArray = JSONObject(message).get("value") as JSONArray
-        val alarmCasio0 = Alarms.fromJsonAlarmFirstAlarm(alarmsJsonArr[0] as JSONObject)
-        IO.writeCmd(GET_SET_MODE.SET, alarmCasio0)
-        val alarmCasio: ByteArray = Alarms.fromJsonAlarmSecondaryAlarms(alarmsJsonArr)
-        IO.writeCmd(GET_SET_MODE.SET, alarmCasio)
-    }
-
-    object AlarmDecoder {
-        private const val HOURLY_CHIME_MASK = 0b10000000
-        private val alarmsQueue = mutableListOf<ArrayList<Int>>()
-
-        fun toJsonNew(command: String) {
-            alarmsQueue.add(Utils.toIntArray(command))
-        }
-
-        fun toJson(command: String): JSONObject {
-            val jsonResponse = JSONObject()
-            val intArray = Utils.toIntArray(command)
-            val alarms = JSONArray()
-
-            when (intArray[0]) {
-                CasioConstants.CHARACTERISTICS.CASIO_SETTING_FOR_ALM.code -> {
-                    intArray.removeAt(0)
-                    alarms.put(createJsonAlarm(intArray))
-                    jsonResponse.put("ALARMS", alarms)
-                }
-
-                CasioConstants.CHARACTERISTICS.CASIO_SETTING_FOR_ALM2.code -> {
-                    intArray.removeAt(0)
-                    val multipleAlarms = intArray.chunked(4)
-                    multipleAlarms.forEach {
-                        alarms.put(createJsonAlarm(it as ArrayList<Int>))
-                    }
-                    jsonResponse.put("ALARMS", alarms)
-                }
-
-                else -> {
-                    Timber.d("Unhandled Command [$command]")
-                }
-            }
-
-            return jsonResponse
-        }
-
-        private fun createJsonAlarm(intArray: ArrayList<Int>): JSONObject {
-            val alarm = Alarms.Alarm(
-                intArray[2],
-                intArray[3],
-                intArray[0] and Alarms.ENABLED_MASK != 0,
-                intArray[0] and HOURLY_CHIME_MASK != 0
-            )
-            val gson = Gson()
-            return JSONObject(gson.toJson(alarm))
-        }
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/AppInfoIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/AppInfoIO.kt
deleted file mode 100644
index 7a0d9684..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/AppInfoIO.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import CachedIO
-import kotlinx.coroutines.CompletableDeferred
-import org.avmedia.gshockapi.ble.GET_SET_MODE
-import org.avmedia.gshockapi.utils.Utils
-
-object AppInfoIO {
-
-    private object DeferredValueHolder {
-        lateinit var deferredResult: CompletableDeferred<String>
-    }
-
-    suspend fun request(): String {
-        return CachedIO.request("22") { key -> getAppInfo(key) }
-    }
-
-    private suspend fun getAppInfo(key: String): String {
-        DeferredValueHolder.deferredResult = CompletableDeferred()
-        IO.request(key)
-        return DeferredValueHolder.deferredResult.await()
-    }
-
-    fun onReceived(data: String) {
-
-        fun setAppInfo(data: String): Unit {
-            // App info:
-            // This is needed to re-enable button D (Lower-right) after the watch has been reset or BLE has been cleared.
-            // It is a hard-coded value, which is what the official app does as well.
-
-            // If watch was reset, the app info will come as:
-            // 0x22 FF FF FF FF FF FF FF FF FF FF 00
-            // In this case, set it to the hardcoded value bellow, so 'D' button will work again.
-            val appInfoCompactStr = Utils.toCompactString(data)
-            if (appInfoCompactStr == "22FFFFFFFFFFFFFFFFFFFF00") {
-                IO.writeCmd(GET_SET_MODE.SET, "223488F4E5D5AFC829E06D02")
-            }
-        }
-
-        setAppInfo(data)
-        DeferredValueHolder.deferredResult.complete(data)
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/ButtonPressedIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/ButtonPressedIO.kt
deleted file mode 100644
index df689c78..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/ButtonPressedIO.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import CachedIO
-import kotlinx.coroutines.CompletableDeferred
-import org.avmedia.gshockapi.utils.Utils
-
-object ButtonPressedIO {
-
-    private object DeferredValueHolder {
-        lateinit var deferredResult: CompletableDeferred<IO.WATCH_BUTTON>
-    }
-
-    suspend fun request(): IO.WATCH_BUTTON {
-        return CachedIO.request("10") { key ->
-            getPressedButton(key)
-        }
-    }
-
-    private suspend fun getPressedButton(key: String): IO.WATCH_BUTTON {
-        DeferredValueHolder.deferredResult = CompletableDeferred()
-        IO.request(key)
-        return DeferredValueHolder.deferredResult.await()
-    }
-
-    fun get(): IO.WATCH_BUTTON {
-        return CachedIO.get("10") as IO.WATCH_BUTTON
-    }
-
-    fun put(value: Any) {
-        CachedIO.put("10", value)
-    }
-
-    fun onReceived(data: String) {
-
-        /*
-        RIGHT BUTTON: 0x10 17 62 07 38 85 CD 7F ->04<- 03 0F FF FF FF FF 24 00 00 00
-        LEFT BUTTON:  0x10 17 62 07 38 85 CD 7F ->01<- 03 0F FF FF FF FF 24 00 00 00
-                      0x10 17 62 16 05 85 dd 7f ->00<- 03 0f ff ff ff ff 24 00 00 00 // after watch reset
-        AUTO-TIME:    0x10 17 62 16 05 85 dd 7f ->03<- 03 0f ff ff ff ff 24 00 00 00 // no button pressed
-        FIND PHONE:   0x10 07 7A 29 33 A1 C6 7F ->02<- 03 0F FF FF FF FF 24 00 00 00 // find phone
-        */
-
-        var ret: IO.WATCH_BUTTON = IO.WATCH_BUTTON.INVALID
-
-        if (data != "" && Utils.toIntArray(data).size >= 19) {
-            val bleIntArr = Utils.toIntArray(data)
-            ret = when (bleIntArr[8]) {
-                in 0..1 -> IO.WATCH_BUTTON.LOWER_LEFT
-                2 -> IO.WATCH_BUTTON.FIND_PHONE
-                4 -> IO.WATCH_BUTTON.LOWER_RIGHT
-                3 -> IO.WATCH_BUTTON.NO_BUTTON // auto time set, no button pressed. Run actions to set time and calender only.
-
-                // For ECB-30 Possible values: 10, 0xE, 0xB
-
-                else -> IO.WATCH_BUTTON.LOWER_LEFT
-            }
-        }
-        DeferredValueHolder.deferredResult.complete(ret)
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/CachedIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/CachedIO.kt
deleted file mode 100644
index d4d3faeb..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/CachedIO.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-import org.avmedia.gshockapi.utils.Utils
-import java.util.Locale
-
-object CachedIO {
-
-    private var cacheOff = false
-    private val cache = mutableMapOf<String, Any?>()
-
-    // Clear the entire cache
-    fun clearCache() {
-        cache.clear()
-    }
-
-    // Remove a specific key
-    fun remove(key: String) {
-        cache.remove(key.uppercase())
-    }
-
-    // Fetch from cache or compute if not present
-    suspend fun <T : Any> request(
-        key: String,
-        compute: suspend (String) -> T
-    ): T {
-        if (cacheOff) {
-            return compute(key).also { cache[key.uppercase()] = it }
-        }
-
-        @Suppress("UNCHECKED_CAST")
-        return (cache[key.uppercase()] as? T) ?: compute(key).also {
-            cache[key.uppercase()] = it
-        }
-    }
-
-    fun set(key: String, func: () -> Unit) {
-        func() // Execute the lambda
-        remove(key) // Remove the cached value for the given key
-    }
-
-    fun put(key: String, value: Any) {
-        cache[key.uppercase()] = value
-    }
-
-    // Get a cached value without recomputing
-    @Suppress("UNCHECKED_CAST")
-    fun <T : Any> get(key: String): T {
-        return cache[key.uppercase()] as T
-    }
-
-    // Generate a compact key
-    fun createKey(data: String): String {
-        val shortStr = Utils.toCompactString(data)
-        val startOfData = shortStr.substring(0, 2).uppercase(Locale.getDefault())
-        val keyLength = if (startOfData in arrayOf("1D", "1E", "1F", "30", "31")) 4 else 2
-        return shortStr.substring(0, keyLength).uppercase(Locale.getDefault())
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/DstForWorldCitiesIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/DstForWorldCitiesIO.kt
deleted file mode 100644
index 993a5282..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/DstForWorldCitiesIO.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import CachedIO
-import android.os.Build
-import androidx.annotation.RequiresApi
-import kotlinx.coroutines.CompletableDeferred
-import org.avmedia.gshockapi.casio.CasioTimeZoneHelper
-import org.avmedia.gshockapi.utils.Utils
-
-@RequiresApi(Build.VERSION_CODES.O)
-object DstForWorldCitiesIO {
-
-    private object DeferredValueHolder {
-        lateinit var deferredResult: CompletableDeferred<String>
-    }
-
-    suspend fun request(cityNumber: Int): String {
-        return CachedIO.request("1e0$cityNumber") { key -> getDSTForWorldCities(key) }
-    }
-
-    private suspend fun getDSTForWorldCities(key: String): String {
-
-        DeferredValueHolder.deferredResult = CompletableDeferred<String>()
-        IO.request(key)
-        return DeferredValueHolder.deferredResult.await()
-    }
-
-    /*
-    0x1e 0-5 TZ_A TZ_B TZ_OFF TZ_DSTOFF TZ_DSTRULES
-    A/B seem to be ignored by the watch
-    OFF & DSTOFF in 15 minute intervals
-
-    Timezones selectable on the watch:
-                       A  B   OFF DSTOFF DSTRULES
-    BAKER ISLAND       39 01  D0  04     00
-    PAGO PAGO          D7 00  D4  04     00
-    HONOLULU           7B 00  D8  04     00
-    ...
-     */
-
-    suspend fun setDST(dst: String, casioTimeZone: CasioTimeZoneHelper.CasioTimeZone): String {
-        val intArray = Utils.toIntArray(dst)
-        if (intArray.size == 7) {
-            intArray[4] = casioTimeZone.offset
-            intArray[5] = casioTimeZone.dstOffset.toInt()
-            intArray[6] = casioTimeZone.dstRules
-        }
-
-        val dstByteArray = Utils.byteArrayOfIntArray(intArray.toIntArray())
-        return Utils.fromByteArrayToHexStrWithSpaces(dstByteArray)
-    }
-
-    fun onReceived(data: String) {
-        DeferredValueHolder.deferredResult.complete(data)
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/DstWatchStateIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/DstWatchStateIO.kt
deleted file mode 100644
index 794436a3..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/DstWatchStateIO.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import CachedIO
-import kotlinx.coroutines.CompletableDeferred
-import org.avmedia.gshockapi.utils.Utils
-
-object DstWatchStateIO {
-
-    private object DeferredValueHolder {
-        lateinit var deferredResult: CompletableDeferred<String>
-    }
-
-    suspend fun request(state: IO.DTS_STATE): String {
-        return CachedIO.request("1d0${state.state}") { key -> getDSTWatchState(key) }
-    }
-
-    private suspend fun getDSTWatchState(key: String): String {
-        DeferredValueHolder.deferredResult = CompletableDeferred()
-        IO.request(key)
-        return DeferredValueHolder.deferredResult.await()
-    }
-
-    /*
-    There are six clocks on the Casio GW-B5600
-    0 is the main clock
-    1-5 are the world clocks
-
-    0x1d 00 01 DST0 DST1 TZ0A TZ0B TZ1A TZ1B ff ff ff ff ff
-    0x1d 02 03 DST2 DST3 TZ2A TZ2B TZ3A TZ3B ff ff ff ff ff
-    0x1d 04 05 DST4 DST5 TZ4A TZ4B TZ5A TZ5B ff ff ff ff ff
-    DST: bitwise flags; bit0: DST on, bit1: DST auto
-    */
-
-    suspend fun setDST(dstState: String, dst: Int): String {
-
-        val intArray = Utils.toIntArray(dstState)
-        intArray[3] = dst
-
-        val newValue = Utils.byteArrayOfIntArray(intArray.toIntArray())
-        return Utils.fromByteArrayToHexStrWithSpaces(newValue)
-    }
-
-    fun onReceived(data: String) {
-        DeferredValueHolder.deferredResult.complete(data)
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/ErrorIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/ErrorIO.kt
deleted file mode 100644
index dfadc3f2..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/ErrorIO.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import timber.log.Timber
-
-object ErrorIO {
-
-    suspend fun request(): String {
-        return "ERROR"
-    }
-
-    fun onReceived(data: String) {
-        Timber.d("ErrorIO: onReceived: $data")
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/EventsIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/EventsIO.kt
deleted file mode 100644
index d15de25a..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/EventsIO.kt
+++ /dev/null
@@ -1,543 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import CachedIO
-import android.annotation.SuppressLint
-import android.os.Build
-import androidx.annotation.RequiresApi
-import com.google.gson.Gson
-import kotlinx.coroutines.CompletableDeferred
-import org.avmedia.gshockapi.Event
-import org.avmedia.gshockapi.ble.Connection
-import org.avmedia.gshockapi.ble.GET_SET_MODE
-import org.avmedia.gshockapi.casio.CasioConstants
-import org.avmedia.gshockapi.casio.ReminderMasks
-import org.avmedia.gshockapi.utils.Utils
-import org.avmedia.gshockapi.utils.Utils.getBooleanSafe
-import org.avmedia.gshockapi.utils.Utils.getJSONArraySafe
-import org.avmedia.gshockapi.utils.Utils.getJSONObjectSafe
-import org.avmedia.gshockapi.utils.Utils.getStringSafe
-import org.json.JSONArray
-import org.json.JSONObject
-import timber.log.Timber
-
-@RequiresApi(Build.VERSION_CODES.O)
-object EventsIO {
-
-    private object DeferredValueHolder {
-        lateinit var deferredResult: CompletableDeferred<Event>
-        lateinit var deferredResultTitle: CompletableDeferred<JSONObject>
-        lateinit var deferredResultTime: CompletableDeferred<JSONObject>
-    }
-
-    @SuppressLint("DefaultLocale")
-    suspend fun request(eventNumber: Int): Event {
-        DeferredValueHolder.deferredResult = CompletableDeferred()
-        DeferredValueHolder.deferredResultTitle = CompletableDeferred()
-        DeferredValueHolder.deferredResultTime = CompletableDeferred()
-
-        suspend fun requestTitle(keyTitle: String): Any {
-            IO.request(keyTitle)
-            return DeferredValueHolder.deferredResultTitle.await()
-        }
-
-        suspend fun requestTime(keyTime: String): Any {
-            IO.request(keyTime)
-            return DeferredValueHolder.deferredResultTime.await()
-        }
-
-        fun combineJSONObjects(obj1: JSONObject, obj2: JSONObject): JSONObject {
-            val combined = JSONObject(obj1.toString()) // Copy all key-value pairs from obj1
-            for (key in obj2.keys()) {
-                combined.put(key, obj2.get(key)) // Overwrite or add key-value pairs from obj2
-            }
-            return combined
-        }
-
-        suspend fun waitForEvent(eventNumber: Int) {
-            val titleVal =
-                CachedIO.request("30$eventNumber") { key -> requestTitle(key) as JSONObject }
-            val timeVal =
-                CachedIO.request("31$eventNumber") { key -> requestTime(key) as JSONObject }
-
-            val eventJson = combineJSONObjects(titleVal, timeVal)
-            DeferredValueHolder.deferredResult.complete(Event(eventJson))
-        }
-
-        waitForEvent(eventNumber)
-        return DeferredValueHolder.deferredResult.await()
-    }
-
-    fun set(events: ArrayList<Event>) {
-
-        val MAX_REMINDERS = 5
-
-        if (events.isEmpty()) {
-            Timber.d("Events model not initialised! Cannot set reminders")
-            return
-        }
-
-        @Synchronized
-        fun toJson(events: ArrayList<Event>): String {
-            val gson = Gson()
-            return gson.toJson(events)
-        }
-
-        fun <T> appendAndTruncate(
-            arr1: ArrayList<T>,
-            arr2: ArrayList<T>,
-            maxSize: Int
-        ): ArrayList<T> {
-            val result = ArrayList<T>()
-
-            result.addAll(arr1)
-            result.addAll(arr2)
-
-            // Truncate the result to the specific size
-            while (result.size > maxSize) {
-                // result.removeLast()
-                result.removeAt(result.size - 1)
-            }
-
-            return result
-        }
-
-        fun getEnabledEvents(events: ArrayList<Event>): ArrayList<Event> {
-            return events.filter { it.enabled } as ArrayList<Event>
-        }
-
-        fun padToMax(currentEvents: ArrayList<Event>, maxReminders: Int): ArrayList<Event> {
-            if (currentEvents.size >= maxReminders) {
-                // If the current list is already equal to or greater than the desired size, return it as is
-                return currentEvents
-            }
-
-            val paddedEvents = ArrayList<Event>(currentEvents)
-
-            val emptyEvent = JSONObject(
-                """
-                 {
-                    "title": "",
-                    "time": {
-                        "daysOfWeek": [],
-                        "enabled": false,
-                        "startDate": {
-                            "day": 1,
-                            "month": "JANUARY",
-                            "year": 2000
-                        },
-                        "endDate": {
-                            "day": 1,
-                            "month": "JANUARY",
-                            "year": 2000
-                        },
-                        "incompatible": false,
-                        "repeatPeriod": "NEVER"
-                    }
-                }
-                """.trimIndent()
-            )
-
-            // Add placeholder or empty Event objects to reach the specified maxReminders count
-            repeat(maxReminders - currentEvents.size) {
-                paddedEvents.add(Event(emptyEvent))
-            }
-
-            return paddedEvents
-        }
-
-        fun getEventsToSend(): ArrayList<Event> {
-            // send all enabled events and not-enabled if enabled less then MAX_REMINDERS
-            val currentEvents = appendAndTruncate(
-                getEnabledEvents(events),
-                events.filter { !it.enabled } as ArrayList<Event>,
-                MAX_REMINDERS)
-
-            // if less then MAX_REMINDERS, pad with empty events
-            return padToMax(currentEvents, MAX_REMINDERS)
-        }
-
-        val eventsToSend = toJson(getEventsToSend())
-        Connection.sendMessage("{action: \"SET_REMINDERS\", value: $eventsToSend }")
-    }
-
-    fun onReceived(data: String) {
-
-        val decoded = ReminderDecoder.reminderTimeToJson(data + 2)
-        DeferredValueHolder.deferredResultTime.complete(decoded)
-    }
-
-    fun onReceivedTitle(data: String) {
-        val decoded = ReminderDecoder.reminderTitleToJson(data)
-        DeferredValueHolder.deferredResultTitle.complete(decoded)
-    }
-
-    fun sendToWatchSet(message: String) {
-        val remindersJsonArr: JSONArray = JSONObject(message).get("value") as JSONArray
-
-        (0 until remindersJsonArr.length()).forEach { index ->
-            val reminderJson = remindersJsonArr.getJSONObject(index)
-
-            fun setFuncTitle() {
-                processReminderTitle(index + 1, reminderJson)
-            }
-
-            fun setFuncTime() {
-                processReminderTime(index + 1, reminderJson)
-            }
-            CachedIO.set("30${index + 1}") { setFuncTitle() }
-            CachedIO.set("31${index + 1}") { setFuncTime() }
-        }
-
-        Timber.i("Got reminders $remindersJsonArr")
-    }
-
-    private fun processReminderTitle(reminderNumber: Int, reminderJson: JSONObject) {
-        // Process title
-        val title = ReminderEncoder.reminderTitleFromJson(reminderJson)
-        IO.writeCmd(
-            GET_SET_MODE.SET, Utils.byteArrayOfInts(
-                CasioConstants.CHARACTERISTICS.CASIO_REMINDER_TITLE.code, reminderNumber
-            ) + title
-        )
-    }
-
-    private fun processReminderTime(reminderNumber: Int, reminderJson: JSONObject) {
-        var reminderTime = IntArray(0)
-        reminderTime += CasioConstants.CHARACTERISTICS.CASIO_REMINDER_TIME.code
-        reminderTime += reminderNumber
-        reminderTime += ReminderEncoder.reminderTimeFromJson(reminderJson)
-
-        IO.writeCmd(GET_SET_MODE.SET, Utils.byteArrayOfIntArray(reminderTime))
-    }
-
-    fun clearAll() {
-        var index = 1
-        repeat(5) {
-            IO.writeCmd(
-                GET_SET_MODE.SET, Utils.byteArrayOfInts(
-                    CasioConstants.CHARACTERISTICS.CASIO_REMINDER_TITLE.code, index
-                ) + ByteArray(18)
-            )
-            CachedIO.remove("30${index}")
-
-            IO.writeCmd(
-                GET_SET_MODE.SET, Utils.byteArrayOfInts(
-                    CasioConstants.CHARACTERISTICS.CASIO_REMINDER_TIME.code, index
-                ) + ByteArray(9)
-            )
-            CachedIO.remove("31${index}")
-            index += 1
-        }
-    }
-
-    object ReminderDecoder {
-        /* Reminders
-            31 01 05 01 01 01 01 01 01 02 00 // set frequency
-                  00 00 00 00 00 00 00 00 00 - not set
-                  02 22 03 31 22 05 01 00 00
-        */
-
-        fun reminderTimeToJson(reminderStr: String): JSONObject {
-
-            val intArr = Utils.toIntArray(reminderStr)
-            if (intArr[3] == 0xFF) {
-                // 0XFF indicates end of reminders
-                return JSONObject("{\"end\": \"\"}")
-            }
-
-            val reminderAll: IntArray = Utils.toIntArray(reminderStr).toIntArray()
-
-            // Remove the first 2 chars:
-            // 0x31 05 <--- 00 23 02 21 23 02 21 00 00
-            val reminder = reminderAll.sliceArray(IntRange(2, reminderAll.lastIndex))
-
-            val reminderJson = JSONObject()
-
-            val timePeriod = decodeTimePeriod(reminder[0])
-            reminderJson.put("enabled", timePeriod.first)
-            reminderJson.put("repeatPeriod", timePeriod.second)
-
-            val timeDetailMap = decodeTimeDetail(reminder)
-
-            reminderJson.put("startDate", timeDetailMap["startDate"])
-            reminderJson.put("endDate", timeDetailMap["endDate"])
-
-            @Suppress("UNCHECKED_CAST")
-            reminderJson.put(
-                "daysOfWeek",
-                convertArrayListToJSONArray(timeDetailMap["daysOfWeek"] as ArrayList<String>)
-            )
-
-            return JSONObject("{\"time\": $reminderJson}")
-        }
-
-        private fun convertArrayListToJSONArray(arrayList: ArrayList<String>): JSONArray {
-            val jsonArray = JSONArray()
-            for (item in arrayList) {
-                jsonArray.put(item)
-            }
-            return jsonArray
-        }
-
-        private fun decodeTimePeriod(timePeriod: Int): Pair<Boolean?, String?> {
-            var enabled: Boolean = false
-
-            if (timePeriod and ReminderMasks.ENABLED_MASK == ReminderMasks.ENABLED_MASK) {
-                enabled = true
-            }
-
-            val repeatPeriod = when {
-                timePeriod and ReminderMasks.WEEKLY_MASK == ReminderMasks.WEEKLY_MASK -> "WEEKLY"
-                timePeriod and ReminderMasks.MONTHLY_MASK == ReminderMasks.MONTHLY_MASK -> "MONTHLY"
-                timePeriod and ReminderMasks.YEARLY_MASK == ReminderMasks.YEARLY_MASK -> "YEARLY"
-                else -> "NEVER"
-            }
-            return Pair(enabled, repeatPeriod)
-        }
-
-        private fun decodeTimeDetail(timeDetail: IntArray): Map<String, Any> {
-            val result = HashMap<String, Any>()
-
-            //                  00 23 02 21 23 02 21 00 00
-            // start from here:    ^
-            // so, skip 1
-            val startDate = decodeDate(timeDetail.sliceArray(IntRange(1, timeDetail.lastIndex)))
-
-            result["startDate"] = startDate
-
-            //                  00 23 02 21 23 02 21 00 00
-            // start from here:             ^
-            // so, skip 4
-            val endDate = decodeDate(timeDetail.sliceArray(IntRange(4, timeDetail.lastIndex)))
-
-            result["endDate"] = endDate
-
-            val dayOfWeek = timeDetail[7]
-            val daysOfWeek = ArrayList<String>()
-            if (dayOfWeek and ReminderMasks.SUNDAY_MASK == ReminderMasks.SUNDAY_MASK) {
-                daysOfWeek.add("SUNDAY")
-            }
-            if (dayOfWeek and ReminderMasks.MONDAY_MASK == ReminderMasks.MONDAY_MASK) {
-                daysOfWeek.add("MONDAY")
-            }
-            if (dayOfWeek and ReminderMasks.TUESDAY_MASK == ReminderMasks.TUESDAY_MASK) {
-                daysOfWeek.add("TUESDAY")
-            }
-            if (dayOfWeek and ReminderMasks.WEDNESDAY_MASK == ReminderMasks.WEDNESDAY_MASK) {
-                daysOfWeek.add("WEDNESDAY")
-            }
-            if (dayOfWeek and ReminderMasks.THURSDAY_MASK == ReminderMasks.THURSDAY_MASK) {
-                daysOfWeek.add("THURSDAY")
-            }
-            if (dayOfWeek and ReminderMasks.FRIDAY_MASK == ReminderMasks.FRIDAY_MASK) {
-                daysOfWeek.add("FRIDAY")
-            }
-            if (dayOfWeek and ReminderMasks.SATURDAY_MASK == ReminderMasks.SATURDAY_MASK) {
-                daysOfWeek.add("SATURDAY")
-            }
-            result["daysOfWeek"] = daysOfWeek
-            return result
-        }
-
-        private fun decodeDate(timeDetail: IntArray): JSONObject {
-            // take the last 2 digits only result = {HashMap@17729}  size = 3
-            val date = JSONObject()
-
-            try {
-                date.put("year", decToHex(timeDetail[0]) + 2000)
-                date.put("month", intToMonthStr(decToHex(timeDetail[1])))
-                date.put("day", decToHex(timeDetail[2]))
-            } catch (e: NumberFormatException) {
-                Timber.e("", "Could not handle time: $timeDetail")
-            }
-
-            return date
-        }
-
-        private fun decToHex(dec: Int): Int {
-            return dec.toString(16).toInt()
-        }
-
-        private fun intToMonthStr(monthInt: Int): String {
-            when (monthInt) {
-                1 -> return "JANUARY"
-                2 -> return "FEBRUARY"
-                3 -> return "MARCH"
-                4 -> return "APRIL"
-                5 -> return "MAY"
-                6 -> return "JUNE"
-                7 -> return "JULY"
-                8 -> return "AUGUST"
-                9 -> return "SEPTEMBER"
-                10 -> return "OCTOBER"
-                11 -> return "NOVEMBER"
-                12 -> return "DECEMBER"
-            }
-
-            return ""
-        }
-
-        fun reminderTitleToJson(titleByte: String): JSONObject {
-            val intArr = Utils.toIntArray(titleByte)
-            if (intArr[2] == 0xFF) {
-                // 0XFF indicates end of reminders
-                return JSONObject("{\"end\": \"\"}")
-            }
-            val reminderJson = JSONObject()
-            reminderJson.put("title", Utils.toAsciiString(titleByte, 2))
-            return reminderJson
-        }
-    }
-
-    object ReminderEncoder {
-        /* Reminders
-            31 01 05 01 01 01 01 01 01 02 00 // set frequency
-                  00 00 00 00 00 00 00 00 00 - not set
-                  02 22 03 31 22 05 01 00 00
-        */
-
-        fun reminderTimeFromJson(reminderJson: JSONObject): IntArray {
-
-            val enabled = reminderJson.getBooleanSafe("enabled")
-            val repeatPeriod = reminderJson.getStringSafe("repeatPeriod")
-            val startDate = reminderJson.getJSONObjectSafe("startDate")
-            val endDate = reminderJson.getJSONObjectSafe("endDate")
-            val daysOfWeek = reminderJson.getJSONArraySafe("daysOfWeek")
-
-            var reminderCmd: IntArray = IntArray(0)
-
-            reminderCmd += createTimePeriod(enabled, repeatPeriod)
-            reminderCmd += createTimeDetail(repeatPeriod, startDate, endDate, daysOfWeek)
-
-            return reminderCmd
-        }
-
-        private fun createTimeDetail(
-            repeatPeriod: String?,
-            startDate: JSONObject?,
-            endDate: JSONObject?,
-            daysOfWeek: JSONArray?
-        ): IntArray {
-            val timeDetail = IntArray(8)
-
-            when (repeatPeriod) {
-                "NEVER" -> {
-                    // Once only, Jun 3
-                    // 31 01 01 22 06 03 22 06 03 00 00
-                    // 31 04 09 22 06 02 22 06 02 00 00
-
-                    encodeDate(timeDetail, startDate, endDate)
-                }
-
-                "WEEKLY" -> {
-                    /*
-                05 01 01 01 01 01 01 20 00 - every friday
-                05 01 01 01 01 01 01 19 00
-                05 01 01 01 01 01 01 02 00 - evey monday
-                00011001 - Sun, Wed, Thu
-                */
-                    encodeDate(timeDetail, startDate, endDate)
-
-                    var dayOfWeek = 0
-
-                    if (daysOfWeek != null) {
-                        (0 until daysOfWeek.length()).forEach { i ->
-                            when (daysOfWeek.getString(i)) {
-                                "SUNDAY" -> dayOfWeek = dayOfWeek or ReminderMasks.SUNDAY_MASK
-                                "MONDAY" -> dayOfWeek = dayOfWeek or ReminderMasks.MONDAY_MASK
-                                "TUESDAY" -> dayOfWeek = dayOfWeek or ReminderMasks.TUESDAY_MASK
-                                "WEDNESDAY" -> dayOfWeek = dayOfWeek or ReminderMasks.WEDNESDAY_MASK
-                                "THURSDAY" -> dayOfWeek = dayOfWeek or ReminderMasks.THURSDAY_MASK
-                                "FRIDAY" -> dayOfWeek = dayOfWeek or ReminderMasks.FRIDAY_MASK
-                                "SATURDAY" -> dayOfWeek = dayOfWeek or ReminderMasks.SATURDAY_MASK
-                            }
-                        }
-                    }
-                    timeDetail[6] = dayOfWeek
-                    timeDetail[7] = 0
-                }
-
-                "MONTHLY" -> {
-                    // Monthly, may 3
-                    // 31 05 11 22 05 03 22 05 03 00 00
-                    encodeDate(timeDetail, startDate, endDate)
-                }
-
-                "YEARLY" -> {
-                    /*
-                09 22 05 02 22 05 02 00 00 - once every year May 2
-                03 22 03 31 22 05 01 00 00 - Period: mar 21 to may 1
-                02 22 03 31 22 05 01 00 00 - same but disabled
-                01 22 04 01 22 04 01 00 00 - only once, apr 1
-                01 22 04 18 22 04 18 00 00 - once only, apr 18
-                 */
-                    encodeDate(timeDetail, startDate, endDate)
-                }
-
-                else -> {
-                    Timber.d("Cannot handle Repeat Period: $repeatPeriod!!!")
-                }
-            }
-            return timeDetail
-        }
-
-        private fun encodeDate(timeDetail: IntArray, startDate: JSONObject?, endDate: JSONObject?) {
-            // take the last 2 digits only
-            timeDetail[0] = decToHex(startDate!!.getInt("year").rem(2000))
-            timeDetail[1] = decToHex(monthStrToInt(startDate.getString("month")))
-            timeDetail[2] = decToHex(startDate.getInt("day"))
-
-            timeDetail[3] = decToHex(endDate!!.getInt("year").rem(2000)) // get the last 2 gits only
-            timeDetail[4] = decToHex(monthStrToInt(endDate.getString("month")))
-            timeDetail[5] = decToHex(endDate.getInt("day"))
-
-            timeDetail[6] = 0
-            timeDetail[7] = 0
-        }
-
-        private fun decToHex(dateField: Int): Int {
-            // Values are stored in hex numbers, that look like decimals, i.e.
-            // 22 04 18 represents 2022, Apr 18. So, we must convert the decimal
-            // numbers from the JSON to hex (i.e 0x22 0x04 0x18).
-            return Integer.parseInt(dateField.toString(), 16)
-        }
-
-        private fun monthStrToInt(monthStr: String): Int {
-            when (monthStr) {
-                "JANUARY" -> return 1
-                "FEBRUARY" -> return 2
-                "MARCH" -> return 3
-                "APRIL" -> return 4
-                "MAY" -> return 5
-                "JUNE" -> return 6
-                "JULY" -> return 7
-                "AUGUST" -> return 8
-                "SEPTEMBER" -> return 9
-                "OCTOBER" -> return 10
-                "NOVEMBER" -> return 11
-                "DECEMBER" -> return 12
-            }
-
-            return -1
-        }
-
-        private fun createTimePeriod(enabled: Boolean?, repeatPeriod: String?): Int {
-            var timePeriod: Int = 0
-
-            if (enabled == true) {
-                timePeriod = timePeriod or ReminderMasks.ENABLED_MASK
-            }
-            when (repeatPeriod) {
-                "WEEKLY" -> timePeriod = timePeriod or ReminderMasks.WEEKLY_MASK
-                "MONTHLY" -> timePeriod = timePeriod or ReminderMasks.MONTHLY_MASK
-                "YEARLY" -> timePeriod = timePeriod or ReminderMasks.YEARLY_MASK
-            }
-            return timePeriod
-        }
-
-        fun reminderTitleFromJson(reminderJson: JSONObject): ByteArray {
-            val titleStr: String = reminderJson.get("title") as String
-            return Utils.toByteArray(titleStr, 18)
-        }
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/HomeTimeIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/HomeTimeIO.kt
deleted file mode 100644
index 4c2291e8..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/HomeTimeIO.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import android.os.Build
-import androidx.annotation.RequiresApi
-import org.avmedia.gshockapi.utils.Utils
-
-@RequiresApi(Build.VERSION_CODES.O)
-object HomeTimeIO {
-
-    suspend fun request(): String {
-        val homeCityRaw = WorldCitiesIO.request(0)
-        return Utils.toAsciiString(homeCityRaw, 2)
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/IO.kt b/api/src/main/java/org/avmedia/gshockapi/io/IO.kt
deleted file mode 100644
index 5a4ae471..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/IO.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Created by Ivo Zivkov (izivkov@gmail.com) on 2022-03-30, 12:06 a.m.
- * Copyright (c) 2022 . All rights reserved.
- * Last modified 2022-03-29, 2:38 p.m.
- */
-
-package org.avmedia.gshockapi.io
-
-import CachedIO
-import android.bluetooth.BluetoothDevice
-import android.bluetooth.BluetoothGattCharacteristic
-import org.avmedia.gshockapi.ble.Connection
-import org.avmedia.gshockapi.ble.GET_SET_MODE
-import java.util.UUID
-
-object IO {
-
-    private var mAvailableCharacteristics: Map<UUID, BluetoothGattCharacteristic>? = null
-    private lateinit var writer: (BluetoothDevice, BluetoothGattCharacteristic, ByteArray) -> Unit
-
-    enum class WATCH_BUTTON {
-        UPPER_LEFT, LOWER_LEFT, UPPER_RIGHT, LOWER_RIGHT, NO_BUTTON, FIND_PHONE, INVALID
-    }
-
-    enum class DTS_STATE(val state: Int) { ZERO(0), TWO(2), FOUR(4) }
-
-    fun request(request: String) {
-        writeCmd(GET_SET_MODE.GET, request)
-    }
-
-    fun init() {
-    }
-
-    fun writeCmd(handle: GET_SET_MODE, bytesArray: ByteArray) {
-        Connection.write(handle, bytesArray)
-    }
-
-    fun writeCmd(handle: GET_SET_MODE, cmd: String) {
-        writeCmdFromString(handle, cmd)
-    }
-
-    /// new
-    private fun writeCmdFromString(handle: GET_SET_MODE, bytesStr: String) {
-        Connection.write(handle, toCasioCmd(bytesStr))
-    }
-
-    private fun toCasioCmd(bytesStr: String): ByteArray {
-        val parts = bytesStr.chunked(2)
-        val hexArr = parts.map { str ->
-            try {
-                str.toInt(16).toByte()
-            } catch (e: java.lang.NumberFormatException) {
-                str.toInt(16).toByte()
-            }
-        }
-        return hexArr.toByteArray()
-    }
-
-    fun removeFromCache(newValue: String) {
-        val key = CachedIO.createKey(newValue)
-        CachedIO.remove(key)
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/RunActionsIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/RunActionsIO.kt
deleted file mode 100644
index c36bb6dc..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/RunActionsIO.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import org.avmedia.gshockapi.ProgressEvents
-import timber.log.Timber
-
-object RunActionsIO {
-
-    suspend fun request(): String {
-        return "RUN_ACTIONS"
-    }
-
-    fun onReceived(data: String) {
-        // 0x0A 02
-        Timber.d("RunActionsIO: onReceived: $data")
-        if (data == "0x0A 02") {
-            ProgressEvents.onNext("RunActions")
-        }
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/SettingsIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/SettingsIO.kt
deleted file mode 100644
index cc3df3a9..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/SettingsIO.kt
+++ /dev/null
@@ -1,211 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import CachedIO
-import android.os.Build
-import androidx.annotation.RequiresApi
-import com.google.gson.Gson
-import kotlinx.coroutines.CompletableDeferred
-import org.avmedia.gshockapi.Settings
-import org.avmedia.gshockapi.ble.Connection
-import org.avmedia.gshockapi.ble.GET_SET_MODE
-import org.avmedia.gshockapi.casio.CasioConstants
-import org.avmedia.gshockapi.utils.Utils
-import org.json.JSONObject
-import kotlin.experimental.and
-import kotlin.experimental.inv
-import kotlin.experimental.or
-
-object SettingsIO {
-    val MASK_24_HOURS = 0b00000001
-    val MASK_BUTTON_TONE_OFF = 0b00000010
-    val MASK_AUTO_LIGHT_OFF = 0b00000100
-    val POWER_SAVING_MODE = 0b00010000
-    val DO_NOT_DISTURB_OFF = 0b01000000
-
-    private object DeferredValueHolder {
-        lateinit var deferredResult: CompletableDeferred<Settings>
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    suspend fun request(): Settings {
-        return CachedIO.request("GET_SETTINGS") { key -> getBasicSettings(key) }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private suspend fun getBasicSettings(key: String): Settings {
-        DeferredValueHolder.deferredResult = CompletableDeferred<Settings>()
-        Connection.sendMessage("{ action: '$key'}")
-        return DeferredValueHolder.deferredResult.await()
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    fun set(settings: Settings) {
-        val settingJson = Gson().toJson(settings)
-        fun setFunc() {
-            Connection.sendMessage("{action: \"SET_SETTINGS\", value: ${settingJson}}")
-        }
-        CachedIO.set("GET_SETTINGS") { setFunc() }
-    }
-
-    fun onReceived(data: String) {
-        val jsonData = decodeToJson(data).toString()
-        val model = Gson().fromJson(jsonData, Settings::class.java)
-        DeferredValueHolder.deferredResult.complete(model)
-    }
-
-    /*
-Time Format:
-24 h:   13 05 00 00 00 00 00 00 00 00 00 00
-12 h:   13 04 00 00 00 00 00 00 00 00 00 00
-
-Date format:
-mm:dd   13 04 00 00 00 00 00 00 00 00 00 00
-dd:mm   13 04 00 00 01 00 00 00 00 00 00 00
-
-Languages:
-english:13 04 00 00 00 00 00 00 00 00 00 00
-spanish:13 04 00 00 00 01 00 00 00 00 00 00
-fr:     13 04 00 00 00 02 00 00 00 00 00 00
-german: 13 04 00 00 00 03 00 00 00 00 00 00
-italian:13 04 00 00 00 04 00 00 00 00 00 00
-russian:13 04 00 00 00 05 00 00 00 00 00 00
-
-Button Tone:
-on:     13 04 00 00 00 00 00 00 00 00 00 00
-off:    13 06 00 00 00 00 00 00 00 00 00 00
-
-Auto Light: ?????
-on:     13 00 00 00 00 00 00 00 00 00 00 00
-off:    13 04 00 00 00 00 00 00 00 00 00 00
-
-Light Duration:
-2s      13 04 00 00 00 00 00 00 00 00 00 00
-4s      13 04 01 00 00 00 00 00 00 00 00 00
-
-Power Saving:
-on      13 04 00 00 00 00 00 00 00 00 00 00
-off     13 14 00 00 00 00 00 00 00 00 00 00
-
-Combination:
-auto light: on
-Power Saving: off
-        13 02 00 00 00 00 00 00 00 00 00 00
-
-24 hours:
-        13 03 00 00 00 00 00 00 00 00 00 00
-
-Byte 2 as binary:
-24 hours:       00000001
-button tone     00000010
-light off:      00000100
-pwr. saving off:00010000
- */
-    private fun decodeToJson(casioArray: String): JSONObject {
-        return createJsonSettings(casioArray)
-    }
-
-    private fun createJsonSettings(settingString: String): JSONObject {
-        val settings = Settings()
-
-        val settingArray = Utils.toIntArray(settingString)
-
-        if (settingArray[1] and MASK_24_HOURS != 0) {
-            settings.timeFormat = "24h"
-        } else {
-            settings.timeFormat = "12h"
-        }
-        settings.buttonTone = settingArray[1] and MASK_BUTTON_TONE_OFF == 0
-        settings.autoLight = settingArray[1] and MASK_AUTO_LIGHT_OFF == 0
-        settings.powerSavingMode = settingArray[1] and POWER_SAVING_MODE == 0
-        settings.DnD = settingArray[1] and DO_NOT_DISTURB_OFF == 0
-
-        if (settingArray[4] == 1) {
-            settings.dateFormat = "DD:MM"
-        } else {
-            settings.dateFormat = "MM:DD"
-        }
-        if (settingArray[5] == 0) {
-            settings.language = "English"
-        }
-        if (settingArray[5] == 1) {
-            settings.language = "Spanish"
-        }
-        if (settingArray[5] == 2) {
-            settings.language = "French"
-        }
-        if (settingArray[5] == 3) {
-            settings.language = "German"
-        }
-        if (settingArray[5] == 4) {
-            settings.language = "Italian"
-        }
-        if (settingArray[5] == 5) {
-            settings.language = "Russian"
-        }
-
-        if (settingArray[2] == 1) {
-            settings.lightDuration = "4s"
-        } else {
-            settings.lightDuration = "2s"
-        }
-
-        return JSONObject(Gson().toJson(settings))
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    fun sendToWatch(message: String) {
-        IO.writeCmd(
-            GET_SET_MODE.GET,
-            Utils.byteArray(CasioConstants.CHARACTERISTICS.CASIO_SETTING_FOR_BASIC.code.toByte())
-        )
-    }
-
-    fun sendToWatchSet(message: String) {
-        val settings = JSONObject(message).get("value") as JSONObject
-        IO.writeCmd(GET_SET_MODE.SET, SettingsEncoder.encode(settings))
-    }
-
-    object SettingsEncoder {
-        fun encode(settings: JSONObject): ByteArray {
-            val arr = ByteArray(12)
-            arr[0] = CasioConstants.CHARACTERISTICS.CASIO_SETTING_FOR_BASIC.code.toByte()
-            if (settings.get("timeFormat") == "24h") {
-                arr[1] = (arr[1] or MASK_24_HOURS.toByte())
-            }
-            if (settings.get("buttonTone") == false) {
-                arr[1] = (arr[1] or MASK_BUTTON_TONE_OFF.toByte())
-            }
-            if (settings.get("autoLight") == false) {
-                arr[1] = (arr[1] or MASK_AUTO_LIGHT_OFF.toByte())
-            }
-            if (settings.get("powerSavingMode") == false) {
-                arr[1] = (arr[1] or POWER_SAVING_MODE.toByte())
-            }
-
-            if (settings.get("DnD") == false) {
-                arr[1] = (arr[1] or DO_NOT_DISTURB_OFF.toByte())
-            }
-
-            if (settings.get("lightDuration") == "4s") {
-                arr[2] = 1
-            }
-            if (settings.get("dateFormat") == "DD:MM") arr[4] = 1
-
-            when (settings.get("language")) {
-                "English" -> arr[5] = 0
-                "Spanish" -> arr[5] = 1
-                "French" -> arr[5] = 2
-                "German" -> arr[5] = 3
-                "Italian" -> arr[5] = 4
-                "Russian" -> arr[5] = 5
-            }
-
-            return arr
-        }
-
-        private fun setDnDFlag(flag: Byte, value: Boolean): Byte {
-            return if (value) flag or DO_NOT_DISTURB_OFF.toByte() else flag and DO_NOT_DISTURB_OFF.toByte()
-                .inv()
-        }
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/TimeAdjustmentIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/TimeAdjustmentIO.kt
deleted file mode 100644
index a125e8fe..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/TimeAdjustmentIO.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import CachedIO
-import android.os.Build
-import androidx.annotation.RequiresApi
-import com.google.gson.Gson
-import kotlinx.coroutines.CompletableDeferred
-import org.avmedia.gshockapi.Settings
-import org.avmedia.gshockapi.ble.Connection
-import org.avmedia.gshockapi.ble.GET_SET_MODE
-import org.avmedia.gshockapi.casio.CasioConstants
-import org.avmedia.gshockapi.utils.Utils
-import org.json.JSONObject
-
-class TimeAdjustmentInfo(
-    var isTimeAdjustmentSet: Boolean = false,
-    var adjustmentTimeMinutes: Int = 0
-)
-
-@RequiresApi(Build.VERSION_CODES.O)
-object TimeAdjustmentIO {
-
-    private object DeferredValueHolder {
-        lateinit var deferredResult: CompletableDeferred<TimeAdjustmentInfo>
-    }
-
-    suspend fun request(): TimeAdjustmentInfo {
-        return CachedIO.request("GET_TIME_ADJUSTMENT") { key -> getTimeAdjustment(key) }
-    }
-
-    private suspend fun getTimeAdjustment(key: String): TimeAdjustmentInfo {
-        DeferredValueHolder.deferredResult = CompletableDeferred()
-        Connection.sendMessage("{ action: '$key'}")
-        return DeferredValueHolder.deferredResult.await()
-    }
-
-    fun set(settings: Settings) {
-        val settingJson = Gson().toJson(settings)
-
-        fun setFunc() {
-            Connection.sendMessage("{action: \"SET_TIME_ADJUSTMENT\", value: ${settingJson}}")
-        }
-        CachedIO.set("GET_TIME_ADJUSTMENT", ::setFunc)
-    }
-
-    fun onReceived(data: String) {
-        val timeAdjustmentSet = isTimeAdjustmentSet(data)
-        val adjustmentTimeMinutes = timeOfAdjustmentMinutes(data)
-        CasioIsAutoTimeOriginalValue.value = data
-        DeferredValueHolder.deferredResult.complete(
-            TimeAdjustmentInfo(
-                timeAdjustmentSet,
-                adjustmentTimeMinutes
-            )
-        )
-    }
-
-    private fun isTimeAdjustmentSet(data: String): Boolean {
-        // syncing off: 110f0f0f0600500004000100->80<-37d2
-        // syncing on:  110f0f0f0600500004000100->00<-37d2
-
-        CasioIsAutoTimeOriginalValue.value = data // save original data for future use
-        return Utils.toIntArray(data)[12] == 0
-    }
-
-    private fun timeOfAdjustmentMinutes(data: String): Int {
-        // syncing off: 110f0f0f060050000400010080->37<-d2
-        val minutesRead = Utils.toIntArray(data)[13]
-
-        val range = 0..59
-        val minutes = if (minutesRead in range) {
-            minutesRead
-        } else {
-            30
-        }
-
-        return minutes
-    }
-
-    object CasioIsAutoTimeOriginalValue {
-        var value = ""
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    fun sendToWatch(message: String) {
-        IO.writeCmd(
-            GET_SET_MODE.GET,
-            Utils.byteArray(CasioConstants.CHARACTERISTICS.CASIO_SETTING_FOR_BLE.code.toByte())
-        )
-    }
-
-    fun sendToWatchSet(message: String) {
-        val settings = JSONObject(message).get("value") as JSONObject
-        // add the original string from Casio, so we do not mess up any ot the other settings.
-        settings.put(
-            "casioIsAutoTimeOriginalValue",
-            CasioIsAutoTimeOriginalValue.value
-        )
-        val encodedTimeAdj = encodeTimeAdjustment(settings)
-        if (encodedTimeAdj.isNotEmpty()) {
-            IO.writeCmd(GET_SET_MODE.SET, encodedTimeAdj)
-        }
-    }
-
-    private fun encodeTimeAdjustment(settings: JSONObject): ByteArray {
-
-        val casioIsAutoTimeOriginalValue = settings.getString("casioIsAutoTimeOriginalValue")
-        if (casioIsAutoTimeOriginalValue.isEmpty()) {
-            return "".toByteArray()
-        }
-
-        // syncing off: 110f0f0f0600500004000100->80<-37d2
-        // syncing on:  110f0f0f0600500004000100->00<-37d2
-
-        val intArray = Utils.toIntArray(casioIsAutoTimeOriginalValue)
-
-        if (settings.get("timeAdjustment") == true) {
-            intArray[12] = 0x00
-        } else {
-            intArray[12] = 0x80
-        }
-
-        val adjustmentTimeMinutes = settings.getInt("adjustmentTimeMinutes")
-        intArray[13] = adjustmentTimeMinutes
-
-        return intArray.foldIndexed(ByteArray(intArray.size)) { i, a, v ->
-            a.apply {
-                set(
-                    i,
-                    v.toByte()
-                )
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/TimeIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/TimeIO.kt
deleted file mode 100644
index 1c70f0de..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/TimeIO.kt
+++ /dev/null
@@ -1,233 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import android.os.Build
-import androidx.annotation.RequiresApi
-import org.avmedia.gshockapi.WatchInfo
-import org.avmedia.gshockapi.ble.Connection
-import org.avmedia.gshockapi.ble.GET_SET_MODE
-import org.avmedia.gshockapi.casio.CasioConstants
-import org.avmedia.gshockapi.casio.CasioTimeZoneHelper
-import org.avmedia.gshockapi.utils.Utils
-import org.json.JSONObject
-import timber.log.Timber
-import java.time.*
-import java.util.*
-
-/*
-When using the API, the app doesn't need to keep a list of world cities to set the time on the watch. It can simply provide the current timezone
-and the API will set the timezone and any applicable Daylight Savings Time rules on the watch. This way, when a user travels from one city to another
-and adjusts the time accordingly, the timezone and DST rules will be set accordingly.
-
-In order to set timezone, we must provide data for register 0x1E, something like this:
-
-0x1E 00 02 76 10 00 00
-
-From the Gadgetbridge project, we have information on what these values mean:
-
-                   0x1E 00  A  B   OFF DSTOFF DSTRULES
-LOS ANGELES                 A1 00  E0  04     01
-DENVER                      54 00  E4  04     01
-CHICAGO                     42 00  E8  04     01
-NEW YORK                    CA 00  EC  04     01
-...
-The CasioTimeZone class handles the code for setting the values of time-zone, offset, and DST offset on the watch.
-It takes a time-zone string in the form of "Pacific/Pago_Pago" and a Casio-specific DST rules code, and
-calculates the corresponding offset and DST offset. A table is then created of all possible CasioTimeZone's
-that can be set on the watch.
-
-The findTimeZone function will take a standard timezone obtained from the Android Locale and try to find the
-Casio-equivalent from the table. If not found, we create a synthetic CasioTimeZone from the Offset and DST Offset
-of the passed timezone, and a value of 0 for the Casio Rules. Most of the timezones not in the Casio table have no DST,
-so this is a reasonable assumption.
-
-Since are are using ZoneId API to obtain the TZ offset and DST offset, we don't have to worry about changes in the timezones,
-since presumably the API will change accordingly.
-
-For setting DST value ON/OFF/AUTO, we update the 0x1D register. The data looks something like this:
-0x1D 00 01 00 03 0C 01 0C 01 FF FF FF FF FF FF
-
-From Gadgetbridge, we see:
-There are six clocks on the Casio GW-B5600
-0 is the main clock
-1-5 are the world clocks
-
-0x1d 00 01 DST0 DST1 TZ0A TZ0B TZ1A TZ1B ff ff ff ff ff
-0x1d 02 03 DST2 DST3 TZ2A TZ2B TZ3A TZ3B ff ff ff ff ff
-0x1d 04 05 DST4 DST5 TZ4A TZ4B TZ5A TZ5B ff ff ff ff ff
-DST: bitwise flags; bit0: DST on, bit1: DST auto
-Here again, are are only concerned with the main clock, so we need to update the value of DST0.
-If the timezone has DST, we set this flag to ON | AUTO, or 3
-If the timezone has no DST, we set the flag to 0
- */
-@RequiresApi(Build.VERSION_CODES.O)
-object TimeIO {
-
-    private var timeZone: String = TimeZone.getDefault().id
-    private var casioTimezone = CasioTimeZoneHelper.findTimeZone(timeZone)
-
-    fun setTimezone(timeZone: String) {
-        this.timeZone = timeZone
-        casioTimezone = CasioTimeZoneHelper.findTimeZone(timeZone)
-    }
-
-    suspend fun set(timeMs: Long? = null) {
-        initializeForSettingTime()
-        val timeToSet = timeMs ?: Clock.systemDefaultZone().millis()
-
-        Connection.sendMessage(
-            "{action: \"SET_TIME\", value: ${timeToSet}}"
-        )
-    }
-
-    private suspend fun getDSTWatchState(state: IO.DTS_STATE): String {
-        return DstWatchStateIO.request(state)
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    enum class DtsMask(val mask: Int) {
-        OFF(0b00),
-        ON(0b01),
-        AUTO(0b10),
-    }
-
-    private suspend fun getDSTWatchStateWithTZ(state: IO.DTS_STATE): String {
-        val origDTS = getDSTWatchState(state)
-
-        val dstValue =
-            (if (casioTimezone.isInDST()) DtsMask.ON.ordinal else DtsMask.OFF.ordinal) or (if (casioTimezone.hasRules()) DtsMask.AUTO.ordinal else 0)
-
-        return DstWatchStateIO.setDST(origDTS, dstValue)
-    }
-
-    private suspend fun getDSTForWorldCities(cityNum: Int): String {
-        return DstForWorldCitiesIO.request(cityNum)
-    }
-
-    private suspend fun getDSTForWorldCitiesWithTZ(cityNum: Int): String {
-        val origDSTForCity = getDSTForWorldCities(cityNum)
-        return DstForWorldCitiesIO.setDST(origDSTForCity, casioTimezone)
-    }
-
-    private suspend fun getWorldCities(cityNum: Int): String {
-        return WorldCitiesIO.request(cityNum)
-    }
-
-    private suspend fun getWorldCitiesWithTZ(cityNum: Int): String {
-        val newCity = WorldCitiesIO.parseCity(timeZone)
-        val encoded = WorldCitiesIO.encodeAndPad(newCity!!, cityNum)
-        IO.removeFromCache(encoded)
-        return encoded
-    }
-
-    /**
-     * This function is internally called by [setTime] to initialize some values.
-     */
-    private suspend fun initializeForSettingTime() {
-        writeDST()
-        writeDSTForWorldCities()
-        writeWorldCities()
-    }
-
-    private suspend fun <T> readAndWrite(
-        function: suspend (T) -> String,
-        param: T
-    ) {
-        val ret: String = function(param)
-        val shortStr = Utils.toCompactString(ret)
-        IO.writeCmd(GET_SET_MODE.SET, shortStr)
-    }
-
-    private suspend fun writeDST() {
-        data class Dts(
-            val param: IO.DTS_STATE,
-            val function: suspend (IO.DTS_STATE) -> String, // Lambda type
-        )
-
-        val dtsStates = arrayOf(
-            Dts(IO.DTS_STATE.ZERO) { state -> getDSTWatchStateWithTZ(state) },
-            Dts(IO.DTS_STATE.TWO) { state -> getDSTWatchState(state) },
-            Dts(IO.DTS_STATE.FOUR) { state -> getDSTWatchState(state) }
-        )
-
-        for (i in 0 until WatchInfo.dstCount) {
-            readAndWrite(dtsStates[i].function, dtsStates[i].param)
-        }
-    }
-
-    private suspend fun writeDSTForWorldCities() {
-        data class DstForWorldCities(
-            val param: Int,
-            val function: suspend (Int) -> String, // Lambda type
-        )
-
-        val dstForWorldCities = arrayOf(
-            DstForWorldCities(0) { cityNumber: Int -> getDSTForWorldCitiesWithTZ(cityNumber) },
-            DstForWorldCities(1) { cityNumber: Int -> getDSTForWorldCities(cityNumber) },
-            DstForWorldCities(2) { cityNumber: Int -> getDSTForWorldCities(cityNumber) },
-            DstForWorldCities(3) { cityNumber: Int -> getDSTForWorldCities(cityNumber) },
-            DstForWorldCities(4) { cityNumber: Int -> getDSTForWorldCities(cityNumber) },
-            DstForWorldCities(5) { cityNumber: Int -> getDSTForWorldCities(cityNumber) },
-        )
-
-        for (i in 0 until WatchInfo.worldCitiesCount) {
-            readAndWrite(dstForWorldCities[i].function, dstForWorldCities[i].param)
-            Timber.i("writeDSTForWorldCities: $i")
-        }
-    }
-
-    private suspend fun writeWorldCities() {
-        data class WorldCities(
-            val param: Int,
-            val function: suspend (Int) -> String, // Lambda type
-        )
-
-        val worldCities = arrayOf(
-            WorldCities(0) { cityNumber: Int -> getWorldCitiesWithTZ(cityNumber) },
-            WorldCities(1) { cityNumber: Int -> getWorldCities(cityNumber) },
-            WorldCities(2) { cityNumber: Int -> getWorldCities(cityNumber) },
-            WorldCities(3) { cityNumber: Int -> getWorldCities(cityNumber) },
-            WorldCities(4) { cityNumber: Int -> getWorldCities(cityNumber) },
-            WorldCities(5) { cityNumber: Int -> getWorldCities(cityNumber) },
-        )
-
-        for (i in 0 until WatchInfo.worldCitiesCount) {
-            readAndWrite(worldCities[i].function, worldCities[i].param)
-            Timber.i("writeWorldCities: $i")
-        }
-    }
-
-    fun sendToWatchSet(message: String) {
-        val dateTimeMs: Long = JSONObject(message).get("value") as Long
-
-        val dstDurationToAdd = if (casioTimezone.isInDST()) casioTimezone.dstOffset * 60 * 15 else 0
-        val msAdjustedForDST = dateTimeMs + dstDurationToAdd
-
-        val instant = Instant.ofEpochMilli(msAdjustedForDST)
-        val adjustedDateTime = LocalDateTime.ofInstant(instant, casioTimezone.zoneId)
-
-        val timeData = TimeEncoder.prepareCurrentTime(adjustedDateTime)
-
-        val timeCommand =
-            Utils.byteArrayOfInts(CasioConstants.CHARACTERISTICS.CASIO_CURRENT_TIME.code) + timeData
-
-        IO.writeCmd(GET_SET_MODE.SET, timeCommand)
-    }
-
-    object TimeEncoder {
-        fun prepareCurrentTime(date: LocalDateTime): ByteArray {
-            val arr = ByteArray(10)
-            val year = date.year
-            arr[0] = (year ushr 0 and 0xff).toByte()
-            arr[1] = (year ushr 8 and 0xff).toByte()
-            arr[2] = date.month.value.toByte()
-            arr[3] = date.dayOfMonth.toByte()
-            arr[4] = date.hour.toByte()
-            arr[5] = date.minute.toByte()
-            arr[6] = date.second.toByte()
-            arr[7] = date.dayOfWeek.value.toByte()
-            arr[8] = (date.nano / 1000000).toByte()
-            arr[9] = 1 // or 0?
-            return arr
-        }
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/TimerIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/TimerIO.kt
deleted file mode 100644
index f0c40912..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/TimerIO.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import CachedIO
-import android.os.Build
-import androidx.annotation.RequiresApi
-import kotlinx.coroutines.CompletableDeferred
-import org.avmedia.gshockapi.ble.Connection
-import org.avmedia.gshockapi.ble.GET_SET_MODE
-import org.avmedia.gshockapi.casio.CasioConstants
-import org.avmedia.gshockapi.utils.Utils
-import org.json.JSONObject
-
-@RequiresApi(Build.VERSION_CODES.O)
-object TimerIO {
-
-    private object DeferredValueHolder {
-        lateinit var deferredResult: CompletableDeferred<Int>
-    }
-
-    suspend fun request(): Int {
-        val timerValue = CachedIO.request("18") { key -> getTimer(key) }
-        return timerValue
-    }
-
-    private suspend fun getTimer(key: String): Int {
-
-        DeferredValueHolder.deferredResult = CompletableDeferred()
-        IO.request(key)
-        return DeferredValueHolder.deferredResult.await()
-    }
-
-    fun set(timerValue: Int) {
-        fun setFunc() {
-            Connection.sendMessage("{action: \"SET_TIMER\", value: $timerValue}")
-        }
-        CachedIO.set("18") { setFunc() }
-    }
-
-    fun onReceived(data: String) {
-        val decoded = TimerDecoder.decodeValue(data)
-        val decodedInt = decoded.toInt()
-        DeferredValueHolder.deferredResult.complete(decodedInt)
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    fun sendToWatch(message: String) {
-        IO.writeCmd(
-            GET_SET_MODE.GET,
-            Utils.byteArray(CasioConstants.CHARACTERISTICS.CASIO_TIMER.code.toByte())
-        )
-    }
-
-    fun sendToWatchSet(message: String) {
-        val seconds = JSONObject(message).get("value").toString()
-        IO.writeCmd(GET_SET_MODE.SET, TimerEncoder.encode(seconds))
-    }
-
-    object TimerDecoder {
-
-        fun decodeValue(data: String): String {
-            val timerIntArray = Utils.toIntArray(data)
-
-            val hours = timerIntArray[1]
-            val minutes = timerIntArray[2]
-            val seconds = timerIntArray[3]
-
-            val inSeconds = hours * 3600 + minutes * 60 + seconds
-            return inSeconds.toString()
-        }
-    }
-
-    object TimerEncoder {
-        fun encode(secondsStr: String): ByteArray {
-            val inSeconds = secondsStr.toInt()
-            val hours = inSeconds / 3600
-            val minutesAndSeconds = inSeconds % 3600
-            val minutes = minutesAndSeconds / 60
-            val seconds = minutesAndSeconds % 60
-
-            val arr = ByteArray(7)
-            arr[0] = 0x18
-            arr[1] = hours.toByte()
-            arr[2] = minutes.toByte()
-            arr[3] = seconds.toByte()
-
-            return arr
-        }
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/UnknownIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/UnknownIO.kt
deleted file mode 100644
index 946365d4..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/UnknownIO.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.avmedia.gshockapi.io
-
-object UnknownIO {
-
-    suspend fun request(): String {
-        return "UNKNOWN"
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    fun onReceived(message: String) {
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/WaitForConnectionIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/WaitForConnectionIO.kt
deleted file mode 100644
index 7db0dcb9..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/WaitForConnectionIO.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import CachedIO
-import android.bluetooth.BluetoothDevice
-import android.content.Context
-import android.os.Build
-import androidx.annotation.RequiresApi
-import kotlinx.coroutines.CompletableDeferred
-import org.avmedia.gshockapi.EventAction
-import org.avmedia.gshockapi.ProgressEvents
-import org.avmedia.gshockapi.ble.Connection
-import org.avmedia.gshockapi.utils.WatchDataListener
-
-@RequiresApi(Build.VERSION_CODES.O)
-object WaitForConnectionIO {
-
-    private object DeferredValueHolder {
-        lateinit var deferredResult: CompletableDeferred<String>
-    }
-
-    suspend fun request(
-        context: Context,
-        deviceId: String?,
-        deviceName: String?
-    ): String {
-        return waitForConnection(context, deviceId, deviceName)
-    }
-
-    private suspend fun waitForConnection(
-        context: Context,
-        deviceId: String?,
-        deviceName: String?
-    ): String {
-
-        if (Connection.isConnected() || Connection.isConnecting()) {
-            return "Connecting"
-        }
-
-        DeferredValueHolder.deferredResult = CompletableDeferred()
-        WatchDataListener.init()
-
-        Connection.startConnection(context, deviceId, deviceName)
-
-        fun waitForConnectionSetupComplete() {
-            val eventActions = arrayOf(
-                EventAction("ConnectionSetupComplete") {
-                    val device =
-                        ProgressEvents.getPayload("ConnectionSetupComplete") as BluetoothDevice
-
-                    CachedIO.clearCache()
-                    DeferredValueHolder.deferredResult.complete("OK")
-                },
-            )
-
-            ProgressEvents.subscriber.runEventActions(this.javaClass.name, eventActions)
-        }
-
-        waitForConnectionSetupComplete()
-        return DeferredValueHolder.deferredResult.await()
-    }
-}
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/WatchConditionIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/WatchConditionIO.kt
deleted file mode 100644
index 527b0de6..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/WatchConditionIO.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import CachedIO
-import kotlinx.coroutines.CompletableDeferred
-import org.avmedia.gshockapi.WatchInfo
-import org.avmedia.gshockapi.utils.Utils
-import timber.log.Timber
-import kotlin.math.roundToInt
-
-object WatchConditionIO {
-
-    private object DeferredValueHolder {
-        var deferredResult: CompletableDeferred<WatchConditionValue>? = null
-    }
-
-    class WatchConditionValue(val batteryLevel: Int, val temperature: Int)
-
-    suspend fun request(): WatchConditionValue {
-        return CachedIO.request("28", ::getWatchCondition)
-    }
-
-    private suspend fun getWatchCondition(key: String): WatchConditionValue {
-        if (DeferredValueHolder.deferredResult == null || DeferredValueHolder.deferredResult?.isActive == false) {
-            DeferredValueHolder.deferredResult = CompletableDeferred()
-            IO.request(key)
-        }
-        return (DeferredValueHolder.deferredResult as CompletableDeferred).await()
-    }
-
-    fun onReceived(data: String) {
-        DeferredValueHolder.deferredResult?.complete(WatchConditionDecoder.decodeValue(data))
-    }
-
-    object WatchConditionDecoder {
-        fun decodeValue(data: String): WatchConditionValue {
-            val intArr = Utils.toIntArray(data)
-            val bytes = Utils.byteArrayOfIntArray(intArr.drop(1).toIntArray())
-
-            if (bytes.size >= 2) {
-                Timber.i("battery level row value: ${bytes[0].toInt()}")
-
-                val batteryLevelLowerLimit = WatchInfo.batteryLevelLowerLimit
-                val batteryLevelUpperLimit = WatchInfo.batteryLevelUpperLimit
-                val multiplier: Int =
-                    (100.0 / (batteryLevelUpperLimit - batteryLevelLowerLimit)).roundToInt()
-                val batteryLevel = (bytes[0].toInt() - batteryLevelLowerLimit)
-                val batteryLevelPercent: Int = (batteryLevel * multiplier).coerceIn(0, 100)
-                val temperature: Int = bytes[1].toInt()
-
-                return WatchConditionValue(batteryLevelPercent, temperature)
-            }
-
-            return WatchConditionValue(0, 0)
-        }
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/WatchNameIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/WatchNameIO.kt
deleted file mode 100644
index d7e402dd..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/WatchNameIO.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import kotlinx.coroutines.CompletableDeferred
-import org.avmedia.gshockapi.utils.Utils
-
-object WatchNameIO {
-
-    private object DeferredValueHolder {
-        lateinit var deferredResult: CompletableDeferred<String>
-    }
-
-    suspend fun request(): String {
-        return getWatchName("23")
-    }
-
-    private suspend fun getWatchName(key: String): String {
-        DeferredValueHolder.deferredResult = CompletableDeferred()
-        IO.request(key)
-        return DeferredValueHolder.deferredResult.await()
-    }
-
-    fun onReceived(data: String) {
-        DeferredValueHolder.deferredResult.complete(
-            Utils.trimNonAsciiCharacters(
-                Utils.toAsciiString(
-                    data,
-                    1
-                )
-            )
-        )
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/io/WorldCitiesIO.kt b/api/src/main/java/org/avmedia/gshockapi/io/WorldCitiesIO.kt
deleted file mode 100644
index 6fc8e574..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/io/WorldCitiesIO.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.avmedia.gshockapi.io
-
-import CachedIO
-import kotlinx.coroutines.CompletableDeferred
-import org.avmedia.gshockapi.utils.Utils
-
-object WorldCitiesIO {
-
-    private object DeferredValueHolder {
-        lateinit var deferredResult: CompletableDeferred<String>
-    }
-
-    suspend fun request(cityNumber: Int): String {
-        return CachedIO.request("1f0$cityNumber", ::getWorldCities)
-    }
-
-    private suspend fun getWorldCities(key: String): String {
-        DeferredValueHolder.deferredResult = CompletableDeferred()
-        IO.request(key)
-        return DeferredValueHolder.deferredResult.await()
-    }
-
-    fun onReceived(data: String) {
-        DeferredValueHolder.deferredResult.complete(data)
-    }
-
-    fun parseCity(timeZone: String): String? {
-        val city = timeZone.split('/').lastOrNull()
-        return city?.uppercase()?.replace('_', ' ')
-    }
-
-    fun encodeAndPad(city: String, cityIndex: Int): String {
-        return ("1F" + "%02x".format(cityIndex) + Utils.toHexStr(city.take(18))
-            .padEnd(36, '0')) // pad to 40 chars
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/utils/Utils.kt b/api/src/main/java/org/avmedia/gshockapi/utils/Utils.kt
deleted file mode 100644
index 073fd1a0..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/utils/Utils.kt
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Created by Ivo Zivkov (izivkov@gmail.com) on 2022-03-30, 12:06 a.m.
- * Copyright (c) 2022 . All rights reserved.
- * Last modified 2022-03-28, 10:38 a.m.
- */
-
-package org.avmedia.gshockapi.utils
-
-import org.json.JSONArray
-import org.json.JSONObject
-import java.util.Locale
-
-object Utils {
-
-    fun String.hexToBytes() =
-        this.chunked(2).map { it.uppercase(Locale.US).toInt(16).toByte() }.toByteArray()
-
-    fun byteArrayOfInts(vararg ints: Int) =
-        ByteArray(ints.size) { pos -> ints[pos].toByte() }
-
-    fun byteArrayOfIntArray(intArray: IntArray) =
-        ByteArray(intArray.size) { pos -> intArray[pos].toByte() }
-
-    private fun toByteArray(string: String): ByteArray {
-        val charset = Charsets.UTF_8
-        return string.toByteArray(charset)
-    }
-
-    fun fromByteArrayToHexStr(byteArray: ByteArray): String {
-        val result = StringBuilder()
-        for (b in byteArray) {
-            result.append(String.format("%02X", b))
-        }
-        return result.toString()
-    }
-
-    fun fromByteArrayToHexStrWithSpaces(byteArray: ByteArray): String {
-        val result = StringBuilder()
-        result.append("0x")
-        for (b in byteArray) {
-            result.append(String.format("%02X ", b))
-        }
-        return result.toString()
-    }
-
-    fun toByteArray(string: String, maxLen: Int): ByteArray {
-        val charset = Charsets.UTF_8
-        val retArr = string.toByteArray(charset)
-        if (retArr.size > maxLen) {
-            return retArr.take(maxLen).toByteArray()
-        }
-        if (retArr.size < maxLen) {
-            return retArr + ByteArray(maxLen - retArr.size)
-        }
-
-        return retArr
-    }
-
-    fun toHexStr(asciiStr: String): String {
-        val byteArr = toByteArray(asciiStr)
-        var hexStr = ""
-        byteArr.forEach {
-            hexStr += "%02x".format(it)
-        }
-        return hexStr
-    }
-
-    fun byteArray(vararg bytes: Byte) = ByteArray(bytes.size) { pos -> bytes[pos] }
-
-    fun toIntArray(hexStr: String): ArrayList<Int> {
-        val intArr = ArrayList<Int>()
-        val strArray = hexStr.split(' ')
-        strArray.forEach {
-            var s = it
-            if (s.startsWith("0x")) {
-                s = s.removePrefix("0x")
-            }
-            intArr.add(Integer.parseInt(s, 16))
-        }
-
-        return intArr
-    }
-
-    fun toAsciiString(hexStr: String, commandLengthToSkip: Int): String {
-        var asciiStr = ""
-        var strArrayWithCommand = hexStr.split(' ')
-        if (strArrayWithCommand.size == 1) { // no spaces between hex values, i.e. 4C4F4E444F4E
-            strArrayWithCommand = hexStr.chunked(2)
-        }
-
-        // skip command
-        val strArray = strArrayWithCommand.subList(commandLengthToSkip, strArrayWithCommand.size)
-        strArray.forEach {
-            if (it != "00") {
-                var s = it
-                if (s.startsWith("0x")) {
-                    s = s.removePrefix("0x")
-                }
-                asciiStr += Integer.parseInt(s, 16).toChar()
-            }
-        }
-
-        return asciiStr
-    }
-
-    fun toCompactString(hexStr: String): String {
-        var compactString = ""
-        val strArray = hexStr.split(' ')
-        strArray.forEach {
-            var s = it
-            if (s.startsWith("0x")) {
-                s = s.removePrefix("0x")
-            }
-            compactString += s
-        }
-
-        return compactString
-    }
-
-    // JSON safe functions, prevent throwing exceptions
-    fun JSONObject.getStringSafe(name: String): String? {
-        if (!has(name)) {
-            return null
-        }
-        return getString(name)
-    }
-
-    fun JSONObject.getBooleanSafe(name: String): Boolean? {
-        if (!has(name)) {
-            return null
-        }
-        return getBoolean(name)
-    }
-
-    fun JSONObject.getJSONObjectSafe(name: String): JSONObject? {
-        if (!has(name)) {
-            return null
-        }
-        return getJSONObject(name)
-    }
-
-    fun JSONObject.getJSONArraySafe(name: String): JSONArray? {
-        if (!has(name)) {
-            return null
-        }
-        return getJSONArray(name)
-    }
-
-    fun JSONObject.getIntSafe(name: String): Int? {
-        if (!has(name)) {
-            return null
-        }
-        return getInt(name)
-    }
-
-    fun trimNonAsciiCharacters(string: String): String {
-        val pattern = Regex("[^\\x00-\\x7F]")
-        return pattern.replace(string, "")
-    }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/avmedia/gshockapi/utils/WatchDataListener.kt b/api/src/main/java/org/avmedia/gshockapi/utils/WatchDataListener.kt
deleted file mode 100644
index 04b89a0b..00000000
--- a/api/src/main/java/org/avmedia/gshockapi/utils/WatchDataListener.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Created by Ivo Zivkov (izivkov@gmail.com) on 2022-03-30, 12:06 a.m.
- * Copyright (c) 2022 . All rights reserved.
- * Last modified 2022-03-20, 10:29 a.m.
- */
-
-package org.avmedia.gshockapi.utils
-
-import android.os.Build
-import androidx.annotation.RequiresApi
-import org.avmedia.gshockapi.EventAction
-import org.avmedia.gshockapi.ProgressEvents
-import org.avmedia.gshockapi.ble.Connection
-import org.avmedia.gshockapi.ble.IDataReceived
-import org.avmedia.gshockapi.casio.MessageDispatcher
-
-/*
-This class accepts data from the watch and calls dataReceived() method on MessageDispatcher class.
-From there, the appropriate onReceived() method is called for the corresponding IO class.
- */
-@RequiresApi(Build.VERSION_CODES.O)
-object WatchDataListener {
-    fun init() {
-        val dataReceived: IDataReceived = object : IDataReceived {
-            override fun dataReceived(data: String?) {
-                data?.let { MessageDispatcher.onReceived(it) }
-            }
-        }
-
-        fun waitForConnectionSetupComplete() {
-            val eventActions = arrayOf(
-                EventAction("ConnectionSetupComplete") {
-                    Connection.setDataCallback(dataReceived)
-                },
-            )
-
-            ProgressEvents.subscriber.runEventActions(this.javaClass.name, eventActions)
-        }
-
-        waitForConnectionSetupComplete()
-    }
-}
\ No newline at end of file
diff --git a/api/src/test/java/org/avmedia/gshockapi/ExampleUnitTest.kt b/api/src/test/java/org/avmedia/gshockapi/ExampleUnitTest.kt
deleted file mode 100644
index 885688b3..00000000
--- a/api/src/test/java/org/avmedia/gshockapi/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.avmedia.gshockapi
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9202c03a..16dfa0c7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "org.avmedia.gshockGoogleSync"
         minSdk 26
         targetSdk 35
-        versionCode 207
-        versionName "20.7"
+        versionCode 208
+        versionName "20.8"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -47,7 +47,7 @@ android {
 }
 
 dependencies {
-    // implementation 'com.github.izivkov:GShockAPI:1.4.34'
+    implementation 'com.github.izivkov:GShockAPI:1.4.35'
 
     implementation 'androidx.core:core-ktx:1.15.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
@@ -57,7 +57,7 @@ dependencies {
     implementation 'androidx.compose.material3:material3:1.3.1'
     implementation 'androidx.appcompat:appcompat-resources:1.7.0'
 
-    implementation project(':api')
+    // implementation project(':api')
 
     implementation 'androidx.work:work-runtime-ktx:2.10.0'
     testImplementation 'junit:junit:4.13.2'
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/GShockApplication.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/GShockApplication.kt
index 160f5758..daed2414 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/GShockApplication.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/GShockApplication.kt
@@ -165,7 +165,6 @@ class GShockApplication : Application() {
             }
         }
 
-        val deviceName = LocalDataStorage.get(this, "LastDeviceName", "")
-        repository.waitForConnection(deviceAddress, deviceName)
+        repository.waitForConnection(deviceAddress)
     }
 }
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/services/DeviceManager.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/services/DeviceManager.kt
index 9fe927c9..dc692f6e 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/services/DeviceManager.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/services/DeviceManager.kt
@@ -26,7 +26,7 @@ class DeviceManager @Inject constructor(
         val eventActions = arrayOf(
             EventAction("DeviceName") {
                 val deviceName = ProgressEvents.getPayload("DeviceName") as String
-                if ((deviceName as String) == "") {
+                if ((deviceName) == "") {
                     LocalDataStorage.delete(appContext, "LastDeviceName")
                 } else if (deviceName.contains("CASIO") && LocalDataStorage.get(
                         appContext,
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/theme/Theme.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/theme/Theme.kt
index 3730c1a6..09cfca17 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/theme/Theme.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/theme/Theme.kt
@@ -2,6 +2,7 @@ package org.avmedia.gshockGoogleSync.theme
 
 import android.app.Activity
 import android.os.Build
+import android.view.WindowInsetsController
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.MaterialTheme
@@ -106,6 +107,7 @@ fun GShockSmartSyncTheme(
                 // WindowCompat.setDecorFitsSystemWindows(window, false)
 
                 // Set the status bar color (still the recommended way as of Android 34+)
+                @Suppress("DEPRECATION")
                 window.statusBarColor = colorScheme.primary.toArgb()
 
                 // Configure light or dark appearance for the status bar icons
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/alarms/AlarmItem.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/alarms/AlarmItem.kt
index d8b396a9..6992214c 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/alarms/AlarmItem.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/alarms/AlarmItem.kt
@@ -106,7 +106,6 @@ fun AlarmItem(
                 Spacer(modifier = Modifier.width(8.dp))
                 AppText(
                     text = stringResource(id = R.string.daily),
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
                 )
             }
             AppSwitch(
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppIntegerSelectionDialog.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppIntegerSelectionDialog.kt
index a1a794a2..433822a5 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppIntegerSelectionDialog.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppIntegerSelectionDialog.kt
@@ -77,8 +77,8 @@ fun NumberPickerView(
     pickerValues: List<Int>,
     selectedIndex: Int,
     onValueChange: (Int) -> Unit,
-    backgroundColor: Color = MaterialTheme.colorScheme.primaryContainer,
-    contentColor: Color = MaterialTheme.colorScheme.onPrimaryContainer
+    backgroundColor: Color = MaterialTheme.colorScheme.surface,
+    contentColor: Color = MaterialTheme.colorScheme.onSurface
 ) {
 
     val safeStep = if (step > 0) step else 1
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppPhoneInputDialog.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppPhoneInputDialog.kt
index bf22d200..8db2c2fa 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppPhoneInputDialog.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppPhoneInputDialog.kt
@@ -33,7 +33,6 @@ fun AppPhoneInputDialog(
     onDismiss: () -> Unit,
     onPhoneNumberValidated: (String) -> Unit,
     backgroundColor: Color = MaterialTheme.colorScheme.primaryContainer,
-    contentColor: Color = MaterialTheme.colorScheme.onPrimaryContainer,
 ) {
     var inputValue by remember { mutableStateOf(initialPhoneNumber.trim()) }
     var validationError by remember { mutableStateOf(false) }
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppText.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppText.kt
index f0c61e54..81929fbb 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppText.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppText.kt
@@ -31,19 +31,12 @@ fun AppText(
     maxLines: Int = Int.MAX_VALUE,
     minLines: Int = 1,
     onTextLayout: ((TextLayoutResult) -> Unit)? = null,
-    style: TextStyle = TextStyle.Default,
-    color: Color = Color.Unspecified
 ) {
     val currentFontScale = LocalDensity.current.fontScale
     val fixedFontSizeStyle = TextStyle(
         fontSize = (16.sp / currentFontScale)  // Fixed font size
     )
 
-    val additionalStyle = TextStyle(
-        color = color,
-    )
-    val combinedStyle = fixedFontSizeStyle.merge(additionalStyle)
-
     Text(
         text = text,
         modifier = modifier,
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextClickable.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextClickable.kt
index d5015380..c1be8a15 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextClickable.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextClickable.kt
@@ -40,7 +40,6 @@ fun AppTextClickable(
     maxLines: Int = Int.MAX_VALUE,
     minLines: Int = 1,
     onTextLayout: ((TextLayoutResult) -> Unit)? = null,
-    color: Color = Color.Unspecified,
     onClick: () -> Unit
 ) {
     val currentFontScale = LocalDensity.current.fontScale
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextExtraLarge.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextExtraLarge.kt
index 4b15167e..763e015e 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextExtraLarge.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextExtraLarge.kt
@@ -30,8 +30,6 @@ fun AppTextExtraLarge(
     maxLines: Int = Int.MAX_VALUE,
     minLines: Int = 1,
     onTextLayout: ((TextLayoutResult) -> Unit)? = null,
-    style: TextStyle = TextStyle.Default,
-    color: Color = Color.Unspecified
 ) {
     Text(
         text = text,
@@ -49,6 +47,5 @@ fun AppTextExtraLarge(
         maxLines = maxLines,
         minLines = minLines,
         onTextLayout = onTextLayout,
-        // style = style.copy(color = color)
     )
 }
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextField.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextField.kt
index ff5c64eb..ac0a2207 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextField.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextField.kt
@@ -56,11 +56,6 @@ fun AppTextField(
         placeholder = {
             AppText(
                 text = placeholderText,
-                style = TextStyle(
-                    fontSize = fontSize,
-                    lineHeight = fontSize,
-                    color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f)
-                )
             )
         }
     )
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextLarge.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextLarge.kt
index a7cab3de..6cb1570d 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextLarge.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextLarge.kt
@@ -31,13 +31,7 @@ fun AppTextLarge(
     maxLines: Int = Int.MAX_VALUE,
     minLines: Int = 1,
     onTextLayout: ((TextLayoutResult) -> Unit)? = null,
-    color: Color = Color.Unspecified
 ) {
-    val currentFontScale = LocalDensity.current.fontScale
-    val fixedFontSizeStyle = TextStyle(
-        fontSize = (16.sp / currentFontScale)  // Fixed font size
-    )
-
     Text(
         text = text,
         modifier = modifier,
@@ -54,7 +48,5 @@ fun AppTextLarge(
         maxLines = maxLines,
         minLines = minLines,
         onTextLayout = onTextLayout,
-        // style = fixedFontSizeStyle,
-        // color = color
     )
 }
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextLink.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextLink.kt
index f1f7ff75..a001aaea 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextLink.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/common/AppTextLink.kt
@@ -31,7 +31,6 @@ fun AppTextLink(
     maxLines: Int = Int.MAX_VALUE,
     minLines: Int = 1,
     onTextLayout: ((TextLayoutResult) -> Unit)? = null,
-    style: TextStyle = TextStyle.Default,
     color: Color = Color.Unspecified,
 ) {
     val currentFontScale = LocalDensity.current.fontScale
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/events/EventViewModel.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/events/EventViewModel.kt
index b4bd1ab5..b5bcd91a 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/events/EventViewModel.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/events/EventViewModel.kt
@@ -50,6 +50,7 @@ class EventViewModel @Inject constructor(
         val eventActions = arrayOf(
             EventAction("CalendarUpdated") {
                 Timber.d("CalendarUpdated, events: ${EventsModel.events.size}")
+                @Suppress("UNCHECKED_CAST")
                 _events.value = ProgressEvents.getPayload("CalendarUpdated") as List<Event>
             },
         )
@@ -63,7 +64,6 @@ class EventViewModel @Inject constructor(
     fun sendEventsToWatch() {
         viewModelScope.launch {
             try {
-                val events = _events.value
                 api.setEvents(ArrayList(_events.value))
                 AppSnackbar("Events Set")
             } catch (e: Exception) {
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/others/RunActionsScreen.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/others/RunActionsScreen.kt
index 492d6e14..5a1cd39d 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/others/RunActionsScreen.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/others/RunActionsScreen.kt
@@ -25,7 +25,6 @@ fun RunActionsScreen(repository: GShockRepository) {
     ) {
         AppTextExtraLarge(
             text = stringResource(id = R.string.running_actions),
-            color = (MaterialTheme.colorScheme.primary),
             fontWeight = FontWeight.Bold // Adjust as needed
         )
 
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/settings/SettingsViewModel.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/settings/SettingsViewModel.kt
index 40c8a5f9..ea748565 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/settings/SettingsViewModel.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/settings/SettingsViewModel.kt
@@ -53,6 +53,7 @@ class SettingsViewModel @Inject constructor(
 
     fun <T : Setting> getSetting(type: Class<T>): T {
         println("getSetting: $type, settingsMap size: ${settingsMap.size}")
+        @Suppress("UNCHECKED_CAST")
         return settingsMap[type] as T
     }
 
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/settings/TimeAdjustment.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/settings/TimeAdjustment.kt
index 2fa3d8fa..8905ef31 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/settings/TimeAdjustment.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/settings/TimeAdjustment.kt
@@ -113,14 +113,14 @@ fun TimeAdjustment(
                 var showDialog by remember { mutableStateOf(false) }
                 var selectedValue by remember { mutableStateOf(adjustmentMinutes.toInt()) }
 
-                AppTextLink(text = selectedValue.toString(),
+                AppTextLink(text = adjustmentMinutes,
                     modifier = Modifier
                         .clickable { showDialog = true }
                         .padding(6.dp),
                 )
                 if (showDialog) {
                     ValueSelectionDialog(
-                        initialValue = selectedValue,
+                        initialValue = adjustmentMinutes.toInt(),
                         range = 0..59,
                         title = stringResource(R.string.when_to_run),
                         label = stringResource(R.string.minutes_between_0_and_59),
diff --git a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/time/LocalTimeView.kt b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/time/LocalTimeView.kt
index 67d8baa4..f89d2f3b 100644
--- a/app/src/main/java/org/avmedia/gshockGoogleSync/ui/time/LocalTimeView.kt
+++ b/app/src/main/java/org/avmedia/gshockGoogleSync/ui/time/LocalTimeView.kt
@@ -55,7 +55,6 @@ fun LocalTimeView(
                 AppTextLarge(
                     modifier = Modifier.padding(start = 6.dp),
                     text = stringResource(id = R.string.local_time),
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
                 )
 
                 TextClockComposable(
@@ -81,9 +80,6 @@ fun LocalTimeView(
                 horizontalAlignment = Alignment.CenterHorizontally
             ) {
                 SendTimeButton(
-                    modifier = Modifier
-                        .padding(5.dp)
-                        .background(MaterialTheme.colorScheme.primary),
                     text = stringResource(id = R.string.send_to_watch),
                     onClick = {
                         timeModel.sendTimeToWatch()
@@ -98,7 +94,7 @@ fun LocalTimeView(
 fun TextClockComposable(
     modifier: Modifier = Modifier,
 ) {
-    RealTimeClock(modifier = modifier.padding(start = 6.dp))
+    RealTimeClock(modifier = modifier.padding(start = 0.dp))
 }
 
 @Composable
@@ -126,7 +122,7 @@ fun TimeZoneTextView(modifier: Modifier = Modifier, textSize: TextUnit) {
 }
 
 @Composable
-fun SendTimeButton(modifier: Modifier = Modifier, text: String, onClick: () -> Unit) {
+fun SendTimeButton(text: String, onClick: () -> Unit) {
     AppButton(
         onClick = {
             onClick()
diff --git a/fastlane/metadata/android/en-US/changelogs/203.txt b/fastlane/metadata/android/en-US/changelogs/203.txt
deleted file mode 100644
index acdf8d89..00000000
--- a/fastlane/metadata/android/en-US/changelogs/203.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed issue with inactivity timer.
-
diff --git a/fastlane/metadata/android/en-US/changelogs/204.txt b/fastlane/metadata/android/en-US/changelogs/204.txt
deleted file mode 100644
index acdf8d89..00000000
--- a/fastlane/metadata/android/en-US/changelogs/204.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed issue with inactivity timer.
-
diff --git a/fastlane/metadata/android/en-US/changelogs/205.txt b/fastlane/metadata/android/en-US/changelogs/205.txt
deleted file mode 100644
index de2473d7..00000000
--- a/fastlane/metadata/android/en-US/changelogs/205.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Changed app package. May have to uninstall current app before installing this version.
-
diff --git a/fastlane/metadata/android/en-US/changelogs/208.txt b/fastlane/metadata/android/en-US/changelogs/208.txt
new file mode 100644
index 00000000..f57ffcb3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/208.txt
@@ -0,0 +1,3 @@
+- Improve UI.
+- Bugs
+
diff --git a/settings.gradle b/settings.gradle
index 9c523d20..950d41bf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,4 +15,3 @@ dependencyResolutionManagement {
 }
 rootProject.name = "Casio GShock Smart Sync"
 include ':app'
-include ':api'