diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 3d8ed0eb6..c70156377 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -240,7 +240,7 @@ SPEC CHECKSUMS:
   file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
   file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
   fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
   flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0
   flutter_local_authentication: 1172a4dd88f6306dadce067454e2c4caf07977bb
diff --git a/lib/onboarding/view/onboarding_page.dart b/lib/onboarding/view/onboarding_page.dart
index 6c5f9e347..b0edc536c 100644
--- a/lib/onboarding/view/onboarding_page.dart
+++ b/lib/onboarding/view/onboarding_page.dart
@@ -8,7 +8,6 @@ import 'package:ente_auth/ente_theme_data.dart';
 import 'package:ente_auth/events/trigger_logout_event.dart';
 import "package:ente_auth/l10n/l10n.dart";
 import 'package:ente_auth/locale.dart';
-import 'package:ente_auth/theme/text_style.dart';
 import 'package:ente_auth/ui/account/email_entry_page.dart';
 import 'package:ente_auth/ui/account/login_page.dart';
 import 'package:ente_auth/ui/account/logout_dialog.dart';
@@ -126,6 +125,7 @@ class _OnboardingPageState extends State<OnboardingPage> {
                       ],
                     ),
                     const SizedBox(height: 100),
+                    // TODO: Remove After Stable
                     // Container(
                     //   width: double.infinity,
                     //   padding: const EdgeInsets.symmetric(horizontal: 20),
@@ -134,7 +134,7 @@ class _OnboardingPageState extends State<OnboardingPage> {
                     //     text: l10n.newUser,
                     //   ),
                     // ),
-                    // const SizedBox(height: 4),
+                    // const SizedBox(height: 24),
                     Container(
                       height: 56,
                       width: double.infinity,
@@ -156,22 +156,23 @@ class _OnboardingPageState extends State<OnboardingPage> {
                       ),
                     ),
                     const SizedBox(height: 4),
-                    Container(
-                      width: double.infinity,
-                      padding: const EdgeInsets.only(top: 20, bottom: 20),
-                      child: GestureDetector(
-                        onTap: _optForOfflineMode,
-                        child: Center(
-                          child: Text(
-                            l10n.useOffline,
-                            style: body.copyWith(
-                              color:
-                                  Theme.of(context).colorScheme.mutedTextColor,
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
+                    // TODO: Remove After Stable
+                    // Container(
+                    //   width: double.infinity,
+                    //   padding: const EdgeInsets.only(top: 20, bottom: 20),
+                    //   child: GestureDetector(
+                    //     onTap: _optForOfflineMode,
+                    //     child: Center(
+                    //       child: Text(
+                    //         l10n.useOffline,
+                    //         style: body.copyWith(
+                    //           color:
+                    //               Theme.of(context).colorScheme.mutedTextColor,
+                    //         ),
+                    //       ),
+                    //     ),
+                    //   ),
+                    // ),
                   ],
                 ),
               ),
diff --git a/lib/ui/settings/account_section_widget.dart b/lib/ui/settings/account_section_widget.dart
index dda8b02f3..4666d244a 100644
--- a/lib/ui/settings/account_section_widget.dart
+++ b/lib/ui/settings/account_section_widget.dart
@@ -56,6 +56,7 @@ class AccountSectionWidget extends StatelessWidget {
         },
       ),
       sectionOptionSpacing,
+      // TODO: Remove After Stable
       // MenuItemWidget(
       //   captionedTextWidget: CaptionedTextWidget(
       //     title: l10n.changePassword,