diff --git a/rust/agama-dbus-server/src/l10n/helpers.rs b/rust/agama-dbus-server/src/l10n/helpers.rs
index 3bccb04a8e..507094cd04 100644
--- a/rust/agama-dbus-server/src/l10n/helpers.rs
+++ b/rust/agama-dbus-server/src/l10n/helpers.rs
@@ -22,7 +22,6 @@ pub fn init_locale() -> Result<LocaleCode, Box<dyn std::error::Error>> {
 /// Sets the service locale.
 ///
 pub fn set_service_locale(locale: &LocaleCode) {
-    // Let's force the encoding to be 'UTF-8'.
     if setlocale(LocaleCategory::LcAll, locale.to_string()).is_none() {
         log::warn!("Could not set the locale");
     }
diff --git a/service/lib/agama/ui_locale.rb b/service/lib/agama/ui_locale.rb
index fc31e8b8a6..4f21dd046e 100644
--- a/service/lib/agama/ui_locale.rb
+++ b/service/lib/agama/ui_locale.rb
@@ -45,7 +45,6 @@ def initialize(locale_client, &block)
   private
 
     def change_locale(locale)
-      # TODO: check if we can use UTF-8 everywhere including strange arch consoles
       language, encoding = locale.split(".")
       Yast::WFM.SetLanguage(language, encoding)
       # explicitly set ENV to get localization also from libraries like libstorage