diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragment.kt
index 1632ea4db..7647fc380 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragment.kt
@@ -146,7 +146,6 @@ class OnlineLibraryFragment : BaseFragment(), FragmentActivityExtensions {
     container: ViewGroup?,
     savedInstanceState: Bundle?
   ): View? {
-    setHasOptionsMenu(true)
     fragmentDestinationDownloadBinding =
       FragmentDestinationDownloadBinding.inflate(inflater, container, false)
     val toolbar = fragmentDestinationDownloadBinding?.root?.findViewById<Toolbar>(R.id.toolbar)
@@ -266,16 +265,6 @@ class OnlineLibraryFragment : BaseFragment(), FragmentActivityExtensions {
     }
   }
 
-  override fun onOptionsItemSelected(item: MenuItem): Boolean {
-    when (item.itemId) {
-      R.id.select_language -> {
-        requireActivity().navigate(R.id.languageFragment)
-        closeKeyboard()
-      }
-    }
-    return super.onOptionsItemSelected(item)
-  }
-
   override fun onDestroyView() {
     super.onDestroyView()
     availableSpaceCalculator.dispose()
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/page/PageFragment.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/page/PageFragment.kt
index 596a53faa..ed84ff435 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/page/PageFragment.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/page/PageFragment.kt
@@ -94,10 +94,6 @@ abstract class PageFragment : OnItemClickListener, BaseFragment(), FragmentActiv
       }
     }
 
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-  }
-
   private fun setupMenu() {
     (requireActivity() as MenuHost).addMenuProvider(
       object : MenuProvider {
@@ -112,6 +108,7 @@ abstract class PageFragment : OnItemClickListener, BaseFragment(), FragmentActiv
           )
         }
 
+        @Suppress("ReturnCount")
         override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
           when (menuItem.itemId) {
             android.R.id.home -> {