diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/download/DownloadRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/download/DownloadRobot.kt
index 21e4a7955..d1b728d75 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/download/DownloadRobot.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/download/DownloadRobot.kt
@@ -68,7 +68,9 @@ class DownloadRobot : BaseRobot() {
     clickOn(ViewId(R.id.downloadsFragment))
   }
 
-  fun waitForDataToLoad(retryCountForDataToLoad: Int = 10) {
+  // Increasing the default timeout for data loading because, on the Android 16 Emulator,
+  // the internet connection is slow, and the library download takes longer.
+  fun waitForDataToLoad(retryCountForDataToLoad: Int = 20) {
     try {
       isVisible(TextId(string.your_languages))
     } catch (e: RuntimeException) {
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/initial/download/InitialDownloadRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/initial/download/InitialDownloadRobot.kt
index a059eac8d..41706d817 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/initial/download/InitialDownloadRobot.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/initial/download/InitialDownloadRobot.kt
@@ -56,7 +56,9 @@ class InitialDownloadRobot : BaseRobot() {
     refresh(R.id.librarySwipeRefresh)
   }
 
-  fun waitForDataToLoad(retryCountForDataToLoad: Int = 10) {
+  // Increasing the default timeout for data loading because, on the Android 16 Emulator,
+  // the internet connection is slow, and the library download takes longer.
+  fun waitForDataToLoad(retryCountForDataToLoad: Int = 20) {
     try {
       isVisible(TextId(string.your_languages))
     } catch (e: RuntimeException) {
diff --git a/app/src/main/res/anim/nav_default_enter_anim.xml b/app/src/main/res/anim/nav_default_enter_anim.xml
deleted file mode 100644
index f35ce95a0..000000000
--- a/app/src/main/res/anim/nav_default_enter_anim.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Kiwix Android
-  ~ Copyright (c) 2020 Kiwix <android.kiwix.org>
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-  <alpha
-    android:duration="300"
-    android:fromAlpha="0.0"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:toAlpha="1.0" />
-</set>
diff --git a/app/src/main/res/anim/nav_default_exit_anim.xml b/app/src/main/res/anim/nav_default_exit_anim.xml
deleted file mode 100644
index 6aef5554f..000000000
--- a/app/src/main/res/anim/nav_default_exit_anim.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Kiwix Android
-  ~ Copyright (c) 2020 Kiwix <android.kiwix.org>
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-  <alpha
-    android:duration="300"
-    android:fromAlpha="1.0"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:toAlpha="0.0" />
-</set>
diff --git a/app/src/main/res/anim/nav_default_pop_enter_anim.xml b/app/src/main/res/anim/nav_default_pop_enter_anim.xml
deleted file mode 100644
index f35ce95a0..000000000
--- a/app/src/main/res/anim/nav_default_pop_enter_anim.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Kiwix Android
-  ~ Copyright (c) 2020 Kiwix <android.kiwix.org>
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-  <alpha
-    android:duration="300"
-    android:fromAlpha="0.0"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:toAlpha="1.0" />
-</set>
diff --git a/app/src/main/res/anim/nav_default_pop_exit_anim.xml b/app/src/main/res/anim/nav_default_pop_exit_anim.xml
deleted file mode 100644
index 6aef5554f..000000000
--- a/app/src/main/res/anim/nav_default_pop_exit_anim.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Kiwix Android
-  ~ Copyright (c) 2020 Kiwix <android.kiwix.org>
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-  <alpha
-    android:duration="300"
-    android:fromAlpha="1.0"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:toAlpha="0.0" />
-</set>
diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
index c4286c9ea..d5796ecb7 100644
--- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -164,6 +164,7 @@ class AllProjectConfigurer {
           add("NotifyDataSetChanged")
           add("Aligned16KB") // TODO Remove when properly migrated to Android 16.
           add("AndroidGradlePluginVersion")
+          add("MemberExtensionConflict")
         }
         lintConfig = target.rootProject.file("lintConfig.xml")
       }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SimpleTextWatcher.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SimpleTextWatcher.kt
deleted file mode 100644
index c401569d7..000000000
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SimpleTextWatcher.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Kiwix Android
- * Copyright (c) 2020 Kiwix <android.kiwix.org>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package org.kiwix.kiwixmobile.core.utils
-
-import android.text.Editable
-import android.text.TextWatcher
-
-class SimpleTextWatcher(
-  private val onTextWatcherChangeAction: (CharSequence?, Int, Int, Int) -> Unit
-) : TextWatcher {
-  @SuppressWarnings("EmptyFunctionBlock")
-  override fun afterTextChanged(p0: Editable?) {
-  }
-
-  @SuppressWarnings("EmptyFunctionBlock")
-  override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-  }
-
-  override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-    onTextWatcherChangeAction.invoke(s, start, before, count)
-  }
-}
diff --git a/core/src/main/res/drawable/ic_qr_code.xml b/core/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index b3de5671c..000000000
--- a/core/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="48dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="48dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M15,21h-2v-2h2V21zM13,14h-2v5h2V14zM21,12h-2v4h2V12zM19,10h-2v2h2V10zM7,12H5v2h2V12zM5,10H3v2h2V10zM12,5h2V3h-2V5zM4.5,4.5v3h3v-3H4.5zM9,9H3V3h6V9zM4.5,16.5v3h3v-3H4.5zM9,21H3v-6h6V21zM16.5,4.5v3h3v-3H16.5zM21,9h-6V3h6V9zM19,19v-3l-4,0v2h2v3h4v-2H19zM17,12l-4,0v2h4V12zM13,10H7v2h2v2h2v-2h2V10zM14,9V7h-2V5h-2v4L14,9zM6.75,5.25h-1.5v1.5h1.5V5.25zM6.75,17.25h-1.5v1.5h1.5V17.25zM18.75,5.25h-1.5v1.5h1.5V5.25z"/>
-    
-</vector>
diff --git a/core/src/main/res/layout/header_language.xml b/core/src/main/res/layout/header_language.xml
deleted file mode 100644
index 0b003c81e..000000000
--- a/core/src/main/res/layout/header_language.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content">
-
-  <TextView
-    android:id="@+id/header_language"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="@dimen/activity_horizontal_margin"
-    android:textAppearance="?textAppearanceSubtitle1"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    tools:text="English" />
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/core/src/main/res/layout/item_book.xml b/core/src/main/res/layout/item_book.xml
deleted file mode 100644
index c64cbfcf0..000000000
--- a/core/src/main/res/layout/item_book.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:layout_margin="@dimen/card_margin">
-
-  <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.constraintlayout.widget.Guideline
-      android:id="@+id/horizontal_padding"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:orientation="vertical"
-      app:layout_constraintGuide_begin="@dimen/activity_horizontal_margin" />
-
-    <androidx.constraintlayout.widget.Guideline
-      android:id="@+id/vertical_padding"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      app:layout_constraintGuide_begin="@dimen/activity_vertical_margin" />
-
-    <CheckBox
-      android:id="@+id/itemBookCheckbox"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:paddingEnd="10dp"
-      android:visibility="gone"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintStart_toStartOf="@+id/horizontal_padding"
-      app:layout_constraintTop_toTopOf="parent"
-      tools:ignore="RtlSymmetry" />
-
-    <ImageView
-      android:id="@+id/item_book_icon"
-      android:layout_width="40dp"
-      android:layout_height="40dp"
-      android:contentDescription="@string/fav_icon"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintStart_toEndOf="@id/itemBookCheckbox"
-      app:layout_constraintTop_toTopOf="parent"
-      tools:src="@mipmap/ic_launcher_round" />
-
-    <TextView
-      android:id="@+id/item_book_title"
-      style="@style/list_item_title"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="@dimen/activity_horizontal_margin"
-      android:layout_marginEnd="@dimen/activity_horizontal_margin"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toEndOf="@id/item_book_icon"
-      app:layout_constraintTop_toBottomOf="@+id/vertical_padding"
-      tools:text="Wikipedia" />
-
-    <TextView
-      android:id="@+id/item_book_description"
-      style="@style/list_item_body"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_marginEnd="8dp"
-      android:ellipsize="end"
-      android:maxLines="2"
-      android:textColor="?textSecondary"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="@id/item_book_title"
-      app:layout_constraintTop_toBottomOf="@id/item_book_title"
-      tools:text="All wikipedia articles" />
-
-    <TextView
-      android:id="@+id/item_book_date"
-      style="@style/list_item_body"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:textColor="?textTertiary"
-      app:layout_constraintStart_toStartOf="@id/item_book_title"
-      app:layout_constraintTop_toBottomOf="@id/item_book_description"
-      tools:text="1 Jan 2018" />
-
-    <TextView
-      android:id="@+id/item_book_size"
-      style="@style/list_item_body"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="@dimen/activity_horizontal_margin"
-      android:layout_marginEnd="@dimen/activity_horizontal_margin"
-      android:textColor="?textTertiary"
-      app:layout_constraintStart_toEndOf="@id/item_book_date"
-      app:layout_constraintTop_toTopOf="@id/item_book_date"
-      tools:text="20 GB" />
-
-    <TextView
-      android:id="@+id/item_book_article_count"
-      style="@style/list_item_body"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="@dimen/activity_horizontal_margin"
-      android:layout_marginEnd="@dimen/activity_horizontal_margin"
-      android:textColor="?textTertiary"
-      app:layout_constraintStart_toEndOf="@id/item_book_size"
-      app:layout_constraintTop_toTopOf="@id/item_book_size"
-      tools:text="10.1 K articles" />
-
-    <org.kiwix.kiwixmobile.core.zim_manager.TagsView
-      android:id="@+id/tags"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="@+id/item_book_description"
-      app:layout_constraintTop_toBottomOf="@id/item_book_date" />
-
-    <View
-      android:id="@+id/item_book_clickable_area"
-      android:layout_width="0dp"
-      android:layout_height="0dp"
-      android:background="?android:attr/selectableItemBackground"
-      app:layout_constraintBottom_toBottomOf="parent"
-      android:contentDescription="@string/zim_file_content_description"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      tools:visibility="gone" />
-
-  </androidx.constraintlayout.widget.ConstraintLayout>
-
-</com.google.android.material.card.MaterialCardView>
diff --git a/core/src/main/res/menu/menu_add_note_dialog.xml b/core/src/main/res/menu/menu_add_note_dialog.xml
deleted file mode 100644
index 911016178..000000000
--- a/core/src/main/res/menu/menu_add_note_dialog.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <item
-    android:id="@+id/delete_note"
-    android:icon="@drawable/ic_delete_white_24dp"
-    android:title="@string/delete"
-    app:showAsAction="ifRoom" />
-
-  <item
-    android:id="@+id/share_note"
-    android:icon="@drawable/baseline_share_24"
-    android:title="@string/share"
-    app:showAsAction="ifRoom" />
-
-  <item
-    android:id="@+id/save_note"
-    android:icon="@drawable/ic_save"
-    android:title="@string/save"
-    app:showAsAction="ifRoom" />
-
-</menu>
diff --git a/lintConfig.xml b/lintConfig.xml
index 218443479..44af8acfc 100644
--- a/lintConfig.xml
+++ b/lintConfig.xml
@@ -52,5 +52,4 @@
     <ignore path="**/androidTest/**.kt" />
   </issue>
   <issue id="PrivateResource" severity="warning" />
-  <issue id="MemberExtensionConflict" severity="warning" />
 </lint>