diff --git a/applications/debug/uart_echo/application.fam b/applications/debug/uart_echo/application.fam
index 3e262a09d..8863a1a94 100644
--- a/applications/debug/uart_echo/application.fam
+++ b/applications/debug/uart_echo/application.fam
@@ -1,12 +1,11 @@
 App(
     appid="uart_echo",
-    name="[GPIO] UART Echo",
+    name="UART Echo",
     apptype=FlipperAppType.DEBUG,
     entry_point="uart_echo_app",
     cdefines=["APP_UART_ECHO"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=70,
-    fap_icon="uart_10px.png",
     fap_category="Debug",
 )
diff --git a/applications/debug/uart_echo/uart_10px.png b/applications/debug/uart_echo/uart_10px.png
deleted file mode 100644
index 8420f5692..000000000
Binary files a/applications/debug/uart_echo/uart_10px.png and /dev/null differ
diff --git a/applications/services/gui/modules/byte_input.c b/applications/services/gui/modules/byte_input.c
index b2a659608..8117329cc 100644
--- a/applications/services/gui/modules/byte_input.c
+++ b/applications/services/gui/modules/byte_input.c
@@ -524,7 +524,7 @@ static void byte_input_handle_down(ByteInputModel* model) {
  *
  * @param      model  The model
  */
-static void byte_input_handle_left(ByteInputModel* model) { // XXX
+static void byte_input_handle_left(ByteInputModel* model) {
     if(byte_input_keyboard_selected(model)) {
         if(model->selected_column > 0) {
             model->selected_column -= 1;
@@ -544,7 +544,7 @@ static void byte_input_handle_left(ByteInputModel* model) { // XXX
  *
  * @param      model  The model
  */
-static void byte_input_handle_right(ByteInputModel* model) { // XXX
+static void byte_input_handle_right(ByteInputModel* model) {
     if(byte_input_keyboard_selected(model)) {
         if(model->selected_column < byte_input_get_row_size(model->selected_row) - 1) {
             model->selected_column += 1;
diff --git a/applications/system/updater/util/update_task_worker_backup.c b/applications/system/updater/util/update_task_worker_backup.c
index 5cfd072f4..50d54cf14 100644
--- a/applications/system/updater/util/update_task_worker_backup.c
+++ b/applications/system/updater/util/update_task_worker_backup.c
@@ -69,8 +69,6 @@ static bool update_task_resource_unpack_cb(const char* name, bool is_directory,
 static void update_task_cleanup_resources(UpdateTask* update_task, const uint32_t n_tar_entries) {
     ResourceManifestReader* manifest_reader = resource_manifest_reader_alloc(update_task->storage);
     do {
-        // storage_simply_remove_recursive(update_task->storage, EXT_PATH("apps"));
-
         FURI_LOG_D(TAG, "Cleaning up old manifest");
         if(!resource_manifest_reader_open(manifest_reader, EXT_PATH("Manifest"))) {
             FURI_LOG_W(TAG, "No existing manifest");
diff --git a/scripts/sconsdist.py b/scripts/sconsdist.py
index b1830ab09..2cf43dce0 100755
--- a/scripts/sconsdist.py
+++ b/scripts/sconsdist.py
@@ -4,7 +4,7 @@ import json
 import shutil
 import tarfile
 import zipfile
-from os import makedirs, walk, environ
+from os import makedirs, walk
 from os.path import basename, exists, join, relpath
 
 from ansi.color import fg
diff --git a/scripts/version.py b/scripts/version.py
index f33c5e6e9..68670061b 100755
--- a/scripts/version.py
+++ b/scripts/version.py
@@ -41,10 +41,6 @@ class GitVersion:
             or "unknown"
         )
 
-        force_no_dirty = os.environ.get("FORCE_NO_DIRTY", None) or ""
-        if force_no_dirty != "":
-            dirty = False
-
         if "SOURCE_DATE_EPOCH" in os.environ:
             commit_date = datetime.utcfromtimestamp(
                 int(os.environ["SOURCE_DATE_EPOCH"])
diff --git a/site_scons/commandline.scons b/site_scons/commandline.scons
index 449edb54b..0b4f03da0 100644
--- a/site_scons/commandline.scons
+++ b/site_scons/commandline.scons
@@ -100,11 +100,6 @@ vars.AddVariables(
         "Version string for updater package",
         "${DIST_SUFFIX}",
     ),
-    (
-        "FORCE_NO_DIRTY",
-        "Force disable dirty status of the build",
-        "",
-    ),
     (
         "COPRO_CUBE_VERSION",
         "Cube version",
diff --git a/site_scons/environ.scons b/site_scons/environ.scons
index 6d7286d2f..b638b1018 100644
--- a/site_scons/environ.scons
+++ b/site_scons/environ.scons
@@ -20,7 +20,6 @@ variables_to_forward = [
     # CI/CD variables
     "WORKFLOW_BRANCH_OR_TAG",
     "DIST_SUFFIX",
-    "FORCE_NO_DIRTY",
     # Python & other tools
     "HOME",
     "APPDATA",