[BUGFIX] Rearranged submenu cleanup