diff --git a/src/bin/cli_app.rs b/src/bin/cli_app.rs
index cb3cc7f..e81c1c7 100644
--- a/src/bin/cli_app.rs
+++ b/src/bin/cli_app.rs
@@ -3,7 +3,6 @@ use std::time::Duration;
 use clap::{Arg, Command};
 use hyper_x_cloud_ii_wireless::devices::{cloud_ii_wireless_dts::CloudIIWirelessDTS, Device};
 
-//TODO: error handling e.g. reconnect on "no such device" error
 fn main() {
     let matches = Command::new(env!("CARGO_PKG_NAME"))
         .version(env!("CARGO_PKG_VERSION"))
diff --git a/src/main.rs b/src/main.rs
index 3da4b69..58eb704 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,8 @@
-use std::sync::{Arc, RwLock};
 use std::time::Duration;
 
 mod status_tray;
 use status_tray::{StatusTray, TrayHandler};
-use hyper_x_cloud_ii_wireless::devices::{connect_compatible_device, Device, DeviceError};
+use hyper_x_cloud_ii_wireless::devices::{connect_compatible_device, DeviceError};
 
 fn handle_error(error: DeviceError) -> String {
     match error {
@@ -23,6 +22,7 @@ fn handle_error(error: DeviceError) -> String {
     }
 }
 
+//TODO: error handling e.g. reconnect on "no such device" error
 fn main() {
     let mut device = loop {
         match connect_compatible_device() {
diff --git a/src/status_tray.rs b/src/status_tray.rs
index 772d819..c2c6e54 100644
--- a/src/status_tray.rs
+++ b/src/status_tray.rs
@@ -1,6 +1,5 @@
-use hyper_x_cloud_ii_wireless::devices::{Device, DeviceState};
+use hyper_x_cloud_ii_wireless::devices::DeviceState;
 use ksni::{menu::StandardItem, Handle, MenuItem, ToolTip, Tray, TrayService};
-use std::sync::{Arc, RwLock, RwLockReadGuard};
 
 pub struct TrayHandler {
     handle: Handle<StatusTray>,