diff --git a/res/layout/udfps_enroll_enrolling_v2.xml b/res/layout/udfps_enroll_enrolling_v2.xml
deleted file mode 100644
index b579bed3f05..00000000000
--- a/res/layout/udfps_enroll_enrolling_v2.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2023 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/suw_lift"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/sud_layout_icon"
-        style="@style/SudGlifIcon"
-        android:layout_marginStart="48dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="68dp"
-        android:scaleType="fitStart"
-        android:src="@drawable/ic_lock" />
-
-    <TextView
-        style="@style/SudGlifHeaderTitle"
-        android:id="@+id/suc_layout_title"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="138dp"
-        android:layout_marginStart="40dp"
-        android:layout_marginEnd="24dp"/>
-
-    <TextView
-        style="@style/SudDescription.Glif"
-        android:id="@+id/sud_layout_subtitle"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="206dp"
-        android:layout_marginStart="40dp"
-        android:layout_marginEnd="24dp"/>
-
-    <com.airbnb.lottie.LottieAnimationView
-        android:id="@+id/illustration_lottie"
-        android:layout_width="match_parent"
-        android:layout_height="200dp"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginTop="206dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="17dp"
-        android:scaleType="centerInside"
-        android:visibility="gone"
-        app:lottie_autoPlay="true"
-        app:lottie_loop="true"
-        app:lottie_speed=".85" />
-
-    <include layout="@layout/udfps_enroll_enrolling_v2_udfps_view"/>
-
-    <Button
-        style="@style/SudGlifButton.Secondary"
-        android:id="@+id/skip_btn"
-        android:text="@string/security_settings_fingerprint_enroll_enrolling_skip"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginBottom="26dp"
-        android:layout_marginStart="66dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/udfps_enroll_enrolling_v2_udfps_view.xml b/res/layout/udfps_enroll_enrolling_v2_udfps_view.xml
deleted file mode 100644
index a29b2fd1c3b..00000000000
--- a/res/layout/udfps_enroll_enrolling_v2_udfps_view.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2023 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<com.android.settings.biometrics2.ui.widget.UdfpsEnrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/udfps_animation_view"
-    android:layout_width="218.42dp"
-    android:layout_height="216dp"
-    android:layout_alignParentTop="true"
-    android:layout_centerHorizontal="true"
-    android:layout_marginTop="553dp">
-
-    <ImageView
-        android:id="@+id/udfps_enroll_animation_fp_progress_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <!-- Fingerprint -->
-    <ImageView
-        android:id="@+id/udfps_enroll_animation_fp_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</com.android.settings.biometrics2.ui.widget.UdfpsEnrollView>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 211a7071872..6f7f57afd17 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -46,4 +46,7 @@
     <!-- For screen lock options button -->
     <item type="id" name="screen_lock_options" />
 
+    <!-- For some widgets still use  this ids under com.android.settings.R-->
+    <item type="id" name="sud_layout_icon" />
+
 </resources>