diff --git a/Makefile b/Makefile
index e5606a42..5154daf1 100644
--- a/Makefile
+++ b/Makefile
@@ -174,7 +174,7 @@ DEFINES += HAVE_CAL_CI_KEY
 endif
 
 # Enabling debug PRINTF
-DEBUG:=1
+DEBUG:=0
 ifneq ($(DEBUG),0)
 DEFINES += HAVE_STACK_OVERFLOW_CHECK
 ifeq ($(TARGET_NAME),TARGET_NANOS)
diff --git a/src/main.c b/src/main.c
index e29b6943..3a35c516 100644
--- a/src/main.c
+++ b/src/main.c
@@ -929,22 +929,14 @@ void init_coin_config(chain_config_t *coin_config) {
     coin_config->kind = CHAIN_KIND;
 }
 
-static char plugin_name[20] = { 0 };
-
-void coin_main(libargs_t *args) {
+void coin_main(chain_config_t *coin_config) {
     chain_config_t config;
-    if (args) {
-        if (args->plugin_name != NULL) {
-            strcpy(plugin_name, args->plugin_name);
-        }
-        if (args->chain_config != NULL) {
-            chainConfig = args->chain_config;
-        }
-    } else {
+    if (coin_config == NULL) {
         init_coin_config(&config);
         chainConfig = &config;
+    } else {
+        chainConfig = coin_config;
     }
-
     reset_app_context();
     tmpCtx.transactionContext.currentItemIndex = 0;
 
@@ -984,7 +976,8 @@ void coin_main(libargs_t *args) {
                 USB_power(0);
                 USB_power(1);
 
-                ui_idle_with_subtext(plugin_name[0] ? plugin_name: NULL);
+                ui_idle();
+
 #ifdef HAVE_BLE
                 BLE_power(0, NULL);
                 BLE_power(1, "Nano X");
@@ -1009,7 +1002,18 @@ void coin_main(libargs_t *args) {
     app_exit();
 }
 
-static void library_main_helper(libargs_t *args) {
+struct libargs_s {
+    unsigned int id;
+    unsigned int command;
+    chain_config_t *chain_config;
+    union {
+        check_address_parameters_t *check_address;
+        create_transaction_parameters_t *create_transaction;
+        get_printable_amount_parameters_t *get_printable_amount;
+    };
+};
+
+static void library_main_helper(struct libargs_s *args) {
     check_api_level(CX_COMPAT_APILEVEL);
     PRINTF("Inside a library \n");
     switch (args->command) {
@@ -1037,7 +1041,7 @@ static void library_main_helper(libargs_t *args) {
     }
 }
 
-void library_main(libargs_t *args) {
+void library_main(struct libargs_s *args) {
     chain_config_t coin_config;
     if (args->chain_config == NULL) {
         init_coin_config(&coin_config);
@@ -1108,7 +1112,7 @@ __attribute__((section(".boot"))) int main(int arg0) {
         return 0;
     }
 
-    libargs_t *args = (libargs_t *) arg0;
+    struct libargs_s *args = (struct libargs_s *) arg0;
     if (args->id != 0x100) {
         app_exit();
         return 0;
@@ -1116,7 +1120,7 @@ __attribute__((section(".boot"))) int main(int arg0) {
     switch (args->command) {
         case RUN_APPLICATION:
             // called as ethereum from altcoin or plugin
-            coin_main(args);
+            coin_main(args->chain_config);
             break;
         default:
             // called as ethereum or altcoin library
diff --git a/src/swap_lib_calls.h b/src/swap_lib_calls.h
index 5a458c9b..9bdb1152 100644
--- a/src/swap_lib_calls.h
+++ b/src/swap_lib_calls.h
@@ -2,7 +2,6 @@
 #define _SWAP_LIB_CALLS_H_
 
 #include "stdbool.h"
-#include "chainConfig.h"
 
 #define RUN_APPLICATION 1
 
@@ -53,16 +52,4 @@ typedef struct create_transaction_parameters_s {
     const char* const destination_address_extra_id;
 } create_transaction_parameters_t;
 
-typedef struct libargs_s {
-    unsigned int id;
-    unsigned int command;
-    chain_config_t *chain_config;
-    union {
-        check_address_parameters_t *check_address;
-        create_transaction_parameters_t *create_transaction;
-        get_printable_amount_parameters_t *get_printable_amount;
-        char *plugin_name;
-    };
-} libargs_t;
-
 #endif  // _SWAP_LIB_CALLS_H_
diff --git a/src_nbgl/ui_idle.c b/src_nbgl/ui_idle.c
index c882ea38..d3ea83c4 100644
--- a/src_nbgl/ui_idle.c
+++ b/src_nbgl/ui_idle.c
@@ -18,10 +18,6 @@ void app_quit(void) {
     os_sched_exit(-1);
 }
 
-void ui_idle_with_subtext(char *test) {
-    nbgl_useCaseHome(APPNAME, &ICONGLYPH, test, true, ui_menu_settings, app_quit);
-}
-
 void ui_idle(void) {
     nbgl_useCaseHome(APPNAME, &ICONGLYPH, NULL, true, ui_menu_settings, app_quit);
 }
\ No newline at end of file