1 files changed, 3 insertions, 6 deletions

diff --git a/apps/plugins/greyscale.c b/apps/plugins/greyscale.c
index 73dd98b216..33254439b6 100644
--- a/apps/plugins/greyscale.c
+++ b/apps/plugins/greyscale.c
@@ -27,7 +27,7 @@
 #if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4)
 #include "lib/grey.h"
 
-PLUGIN_HEADER
+
 
 /* variable button definitions */
 #if CONFIG_KEYPAD == RECORDER_PAD
@@ -316,9 +316,7 @@ int main(void)
 
         button = rb->button_get(true);
 
-        if (rb->default_event_handler_ex(button, cleanup, NULL) 
-            == SYS_USB_CONNECTED)
-            return PLUGIN_USB_CONNECTED;
+        exit_on_usb(button);
 
         if (button & GREYSCALE_SHIFT)
         {
@@ -369,8 +367,6 @@ int main(void)
             case GREYSCALE_RC_OFF:
 #endif
             case GREYSCALE_OFF:
-
-                cleanup(NULL);
                 return PLUGIN_OK;
         }
     }
@@ -382,6 +378,7 @@ enum plugin_status plugin_start(const void* parameter)
 {
     (void)parameter;
 
+    atexit(cleanup);
     return main();
 }