diff --git a/project/backend/manager.c b/project/backend/manager.c
index 15506d7..fa5977f 100644
--- a/project/backend/manager.c
+++ b/project/backend/manager.c
@@ -100,16 +100,7 @@ Manager* manager_init() {
 }
 
 // Functions
-void manager_savepass(Manager* manager, Password* pass) {
-    // Not using Manager Right Now
-    UNUSED(manager);
-
-    // DEBUG
-    FURI_LOG_D(TAG, "Saving:\nN:%s\nU:%s\nP:%s",
-        pass->name,
-        pass->user,
-        pass->phrase);
-
+void manager_savepass(Password* pass) {
     // Our resulting string
     char* result = store_load("Data");
     
@@ -206,5 +197,6 @@ void manager_free(Manager* manager) {
     }
 
     free(manager->current);
+    free(manager->new);
     free(manager);
 }
\ No newline at end of file
diff --git a/project/backend/manager.h b/project/backend/manager.h
index 70c93b4..d59e7fb 100644
--- a/project/backend/manager.h
+++ b/project/backend/manager.h
@@ -22,7 +22,7 @@ typedef struct {
 Manager* manager_init();
 
 // Functions
-void manager_savepass(Manager* manager, Password* pass);
+void manager_savepass(Password* pass);
 void manager_loadpass(Manager* manager, char* name);
 void manager_free(Manager* manager);
 
diff --git a/project/backend/ui.c b/project/backend/ui.c
index 8818feb..6ee6748 100644
--- a/project/backend/ui.c
+++ b/project/backend/ui.c
@@ -528,7 +528,7 @@ bool FP_Scene_Event_Create(void* context, SceneManagerEvent event) {
             break;
         case FP_Scene_Create_Event_Done:
             // Save the password
-            manager_savepass(app->manager, app->manager->new);
+            manager_savepass(app->manager->new);
 
             // Reload manager
             manager_free(app->manager);
@@ -548,28 +548,9 @@ bool FP_Scene_Event_Create(void* context, SceneManagerEvent event) {
     return consumed;
 }
 bool FP_Scene_Event_Type(void* context, SceneManagerEvent event) {
-    // Setting context
-    FP_App* app = context;
-    bool consumed = false;
-
-    // Switching based on event
-    if (event.type == SceneManagerEventTypeCustom) {
-        // We consumed it
-        consumed = true;
-
-        UNUSED(app);
-
-        // What to do?
-        switch (event.event) {
-        default:
-            break;
-        }
-    } else {
-        consumed = false;
-    }
-
     // Return result
-    return consumed;
+    UNUSED(context);
+    return event.type == SceneManagerEventTypeCustom;
 }
 
 /* Handlers */
diff --git a/project/flippypass.c b/project/flippypass.c
index ffaa9cf..758207e 100644
--- a/project/flippypass.c
+++ b/project/flippypass.c
@@ -3,19 +3,11 @@
 
 #include "backend/ui.h"
 
-// Functions
-void debug_template() {
-    store_save("Data", "Apple|example@objnull.net|password|0|Microsoft|person@objnull.net|password|0|Google|user1@objnull.net|password|0|Facebook|user2@objnull.net|password|0|Twitter|user3@objnull.net|password|0|Instagram|user4@objnull.net|password|0|LinkedIn|user5@objnull.net|password|0|GitHub|user6@objnull.net|password|0|Reddit|user7@objnull.net|password|0|Spotify|user8@objnull.net|password|0|Netflix|user9@objnull.net|password|0|Dropbox|user10@objnull.net|password|0|Proton|user54@objnull.net|password|0|Authentik|user19@objnull.net|password|0");
-}
-
 // Entry Point
 int32_t flippypass_app(void* p) {
     // Not using P Parameter
     UNUSED(p);
 
-    // Saving to a default file:
-    //debug_template();
-
     // Creating App
     FP_App* app = fp_app_init();