diff --git a/src/flutter.rs b/src/flutter.rs
index 81b455b04..566576b5d 100644
--- a/src/flutter.rs
+++ b/src/flutter.rs
@@ -365,7 +365,7 @@ pub mod connection_manager {
                 log::debug!("call_service_set_by_name fail,{}", e);
             }
             // send to UI, refresh widget
-            self.push_event("add_connection", vec![("client", &client_json)]); // TODO  use add_connection
+            self.push_event("add_connection", vec![("client", &client_json)]);
         }
 
         fn remove_connection(&self, id: i32) {
diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs
index f3c7b3735..568096b1c 100644
--- a/src/flutter_ffi.rs
+++ b/src/flutter_ffi.rs
@@ -575,7 +575,6 @@ pub fn main_forget_password(id: String) {
     forget_password(id)
 }
 
-// TODO APP_DIR & ui_interface
 pub fn main_get_recent_peers() -> String {
     if !config::APP_DIR.read().unwrap().is_empty() {
         let peers: Vec<(String, config::PeerInfoSerde)> = PeerConfig::peers()
@@ -709,9 +708,6 @@ pub fn session_new_rdp(id: String) {
 }
 
 pub fn main_get_last_remote_id() -> String {
-    // if !config::APP_DIR.read().unwrap().is_empty() {
-    //     res = LocalConfig::get_remote_id();
-    // }
     LocalConfig::get_remote_id()
 }
 
diff --git a/src/ui/remote.rs b/src/ui/remote.rs
index 9cf04b69a..76e1ee96c 100644
--- a/src/ui/remote.rs
+++ b/src/ui/remote.rs
@@ -411,7 +411,6 @@ impl sciter::EventHandler for SciterSession {
 impl SciterSession {
     pub fn new(cmd: String, id: String, password: String, args: Vec<String>) -> Self {
         let session: Session<SciterHandler> = Session {
-            cmd: cmd.clone(),
             id: id.clone(),
             password: password.clone(),
             args,
diff --git a/src/ui_interface.rs b/src/ui_interface.rs
index 0b95cd588..133dd24b0 100644
--- a/src/ui_interface.rs
+++ b/src/ui_interface.rs
@@ -139,10 +139,6 @@ pub fn get_license() -> String {
 
 pub fn get_option(key: String) -> String {
     get_option_(&key)
-    // #[cfg(any(target_os = "android", target_os = "ios"))]
-    // return Config::get_option(&key);
-    // #[cfg(not(any(target_os = "android", target_os = "ios")))]
-    // return get_option_(&key);
 }
 
 fn get_option_(key: &str) -> String {
@@ -208,7 +204,6 @@ pub fn get_sound_inputs() -> Vec<String> {
     let mut a = Vec::new();
     #[cfg(not(target_os = "linux"))]
     {
-        // TODO TEST
         fn get_sound_inputs_() -> Vec<String> {
             let mut out = Vec::new();
             use cpal::traits::{DeviceTrait, HostTrait};
@@ -236,7 +231,7 @@ pub fn get_sound_inputs() -> Vec<String> {
             a.push(name);
         }
     }
-    #[cfg(target_os = "linux")] // TODO
+    #[cfg(target_os = "linux")]
     {
         let inputs: Vec<String> = crate::platform::linux::get_pa_sources()
             .drain(..)
diff --git a/src/ui_session_interface.rs b/src/ui_session_interface.rs
index 7af3a2fbd..945c45385 100644
--- a/src/ui_session_interface.rs
+++ b/src/ui_session_interface.rs
@@ -35,7 +35,6 @@ lazy_static::lazy_static! {
 
 #[derive(Clone, Default)]
 pub struct Session<T: InvokeUiSession> {
-    pub cmd: String,
     pub id: String,
     pub password: String,
     pub args: Vec<String>,
@@ -53,7 +52,7 @@ impl<T: InvokeUiSession> Session<T> {
     pub fn get_image_quality(&self) -> String {
         self.lc.read().unwrap().image_quality.clone()
     }
-    /// Get custom image quality.
+
     pub fn get_custom_image_quality(&self) -> Vec<i32> {
         self.lc.read().unwrap().custom_image_quality.clone()
     }
@@ -1115,7 +1114,6 @@ impl<T: InvokeUiSession> Interface for Session<T> {
                 crate::platform::windows::add_recent_document(&path);
             }
         }
-        // TODO use event callbcak
         #[cfg(not(any(target_os = "android", target_os = "ios")))]
         self.start_keyboard_hook();
     }
@@ -1158,8 +1156,6 @@ impl<T: InvokeUiSession> Interface for Session<T> {
     }
 }
 
-// TODO use event callbcak
-// sciter only
 #[cfg(not(any(target_os = "android", target_os = "ios")))]
 impl<T: InvokeUiSession> Session<T> {
     fn start_keyboard_hook(&self) {