diff --git a/src/server/index.rs b/src/server/index.rs
deleted file mode 100644
index 1d302b1..0000000
--- a/src/server/index.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use actix_web::{HttpResponse, Responder};
-
-pub async fn index_handler() -> impl Responder {
-    let documentation = r#"
-Omega API Server
-
-Available Routes:
-- /api/*    : API endpoints for the Omega server.
-- /direct/* : Resolution for shortened links.
-
-All other routes will return this documentation.
-"#;
-
-    HttpResponse::Ok()
-        .content_type("text/plain; charset=utf-8")
-        .body(documentation)
-}
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 59e9769..8645e6e 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -1,4 +1,3 @@
 pub mod api;
-pub mod index;
 pub mod server;
 pub mod short_link;
diff --git a/src/server/server.rs b/src/server/server.rs
index 1fcfe04..3618eb7 100644
--- a/src/server/server.rs
+++ b/src/server/server.rs
@@ -1,6 +1,6 @@
 use crate::{
     log,
-    server::{api, index::index_handler, short_link::get_short_link},
+    server::{api, short_link::get_short_link},
     util::file_util::load_file_buf,
 };
 
@@ -37,7 +37,6 @@ pub async fn start(port: u16) -> anyhow::Result<()> {
         App::new()
             .route("/api/{path:.*}", web::to(api_handler))
             .route("/direct/{path:.*}", web::to(direct_handler))
-            .default_service(web::to(index_handler))
     })
     .bind_rustls_0_23(addr, config)?
     .run()
diff --git a/src/transport/omikron_connection.rs b/src/transport/omikron_connection.rs
index 47b42ef..327c52c 100644
--- a/src/transport/omikron_connection.rs
+++ b/src/transport/omikron_connection.rs
@@ -433,10 +433,8 @@ impl OmikronConnection {
 
     async fn handle_iota_connected(self: Arc<Self>, cv: CommunicationValue, omikron_id: i64) {
         log_in!(PrintType::Omega, "IOTA connected");
-        let iota_id = match cv.get_data(DataTypes::iota_id).as_number() {
-            Some(id) => id as i64,
-            None => return,
-        };
+        let iota_id = cv.get_sender();
+        let iota_id = iota_id as i64;
         user_online_tracker::track_iota_connection(iota_id, omikron_id, true);
 
         let mut user_ids = Vec::new();
@@ -462,10 +460,8 @@ impl OmikronConnection {
 
     async fn handle_iota_disconnected(self: Arc<Self>, cv: CommunicationValue, omikron_id: i64) {
         log_in!(PrintType::Omega, "IOTA disconnected");
-        let iota_id = match cv.get_data(DataTypes::iota_id).as_number() {
-            Some(id) => id as i64,
-            None => return,
-        };
+        let iota_id = cv.get_sender();
+        let iota_id = iota_id as i64;
         let iota_offline = user_online_tracker::untrack_iota_connection(iota_id, omikron_id);
         if iota_offline {
             if let Ok(users) = sql::get_users_by_iota_id(iota_id).await {
@@ -616,14 +612,13 @@ impl OmikronConnection {
 
     async fn handle_get_iota_data(self: Arc<Self>, cv: CommunicationValue) -> OmikronResult<()> {
         // Try by iota_id
-        if let Some(iota_id) = cv.get_data(DataTypes::iota_id).as_number() {
-            if let Ok((iota_id, public_key)) = get_iota_by_id(iota_id as i64).await {
-                let response = self
-                    .clone()
-                    .build_iota_data_response(cv.get_id(), iota_id, public_key, None, None)
-                    .await;
-                return self.send(&response).await;
-            }
+        let iota_id = cv.get_sender();
+        if let Ok((iota_id, public_key)) = get_iota_by_id(iota_id as i64).await {
+            let response = self
+                .clone()
+                .build_iota_data_response(cv.get_id(), iota_id, public_key, None, None)
+                .await;
+            return self.send(&response).await;
         }
 
         // Try by user_id