diff --git a/factory/framework/Android.bp b/factory/framework/Android.bp
deleted file mode 100644
index 54b5b68f..00000000
--- a/factory/framework/Android.bp
+++ /dev/null
@@ -1,15 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
-    ],
-}
-
-runtime_resource_overlay {
-    name: "FactoryOverlayFrameworkRes",
-    product_specific: true,
-}
diff --git a/factory/framework/AndroidManifest.xml b/factory/framework/AndroidManifest.xml
deleted file mode 100644
index 73875be8..00000000
--- a/factory/framework/AndroidManifest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 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.
--->
-<!-- Pixel specific factory overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.frameworkres.overlay.factory">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="android"
-      android:isStatic="true"
-      android:priority="2"/>
-</manifest>
diff --git a/factory/framework/res/drawable-nodpi/default_wallpaper.png b/factory/framework/res/drawable-nodpi/default_wallpaper.png
deleted file mode 100644
index 93b787e3..00000000
Binary files a/factory/framework/res/drawable-nodpi/default_wallpaper.png and /dev/null differ
diff --git a/factory/launcher3/Android.bp b/factory/launcher3/Android.bp
deleted file mode 100644
index 31ee56ae..00000000
--- a/factory/launcher3/Android.bp
+++ /dev/null
@@ -1,15 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
-    ],
-}
-
-runtime_resource_overlay {
-    name: "FactoryOverlayLauncher3",
-    product_specific: true,
-}
diff --git a/factory/launcher3/AndroidManifest.xml b/factory/launcher3/AndroidManifest.xml
deleted file mode 100644
index 3f285855..00000000
--- a/factory/launcher3/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 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.
--->
-<!-- Pixel specific factory overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.launcher3.overlay.factory">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.launcher3"
-      android:targetName="favorites"
-      android:isStatic="true"
-      android:priority="2"/>
-</manifest>
diff --git a/factory/launcher3/res/xml/default_workspace_5x5.xml b/factory/launcher3/res/xml/default_workspace_5x5.xml
deleted file mode 100644
index 7abd7dd5..00000000
--- a/factory/launcher3/res/xml/default_workspace_5x5.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
-
-    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer, android test tool, label barcode, battery charge tool, barcode scanner -->
-    <resolve
-        launcher:container="-101"
-        launcher:screen="0"
-        launcher:x="0"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />
-        <favorite launcher:uri="tel:123" />
-        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="0" >
-        <favorite
-            launcher:packageName="com.google_npi.androidtesttool"
-            launcher:className="com.google_npi.androidtesttool.MainActivity" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="2"
-        launcher:x="2"
-        launcher:y="0" >
-        <favorite
-            launcher:packageName="com.google_cte.labelbarcode"
-            launcher:className="com.google_cte.labelbarcode.LabelBarcodeMainActivity" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="3"
-        launcher:x="3"
-        launcher:y="0" >
-        <favorite
-            launcher:packageName="com.google.batterychargetool"
-            launcher:className="com.google.batterychargetool.MainActivity" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="4"
-        launcher:x="4"
-        launcher:y="0" >
-        <favorite
-            launcher:packageName="com.google_cte.barcodescanner"
-            launcher:className="com.google_cte.barcodescanner.MainActivity" />
-    </resolve>
-
-</favorites>
diff --git a/factory/settings/Android.bp b/factory/settings/Android.bp
deleted file mode 100644
index adc3ea41..00000000
--- a/factory/settings/Android.bp
+++ /dev/null
@@ -1,15 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
-    ],
-}
-
-runtime_resource_overlay {
-    name: "FactoryOverlaySettings",
-    product_specific: true,
-}
diff --git a/factory/settings/AndroidManifest.xml b/factory/settings/AndroidManifest.xml
deleted file mode 100644
index 72e7838a..00000000
--- a/factory/settings/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 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.
--->
-<!-- Pixel specific factory overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.providers.settings.overlay.factory">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.providers.settings"
-      android:targetName="resources"
-      android:isStatic="true"
-      android:priority="2"/>
-</manifest>
diff --git a/factory/settings/res/values/defaults.xml b/factory/settings/res/values/defaults.xml
deleted file mode 100644
index b7febd9e..00000000
--- a/factory/settings/res/values/defaults.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2009, 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.
- */
--->
-<resources>
-  <integer name="def_lockscreen_sounds_enabled">0</integer>
-  <bool name="def_lockscreen_disabled">true</bool>
-  <bool name="def_dtmf_tones_enabled">false</bool>
-  <bool name="def_sound_effects_enabled">false</bool>
-  <bool name="def_charging_sounds_enabled">false</bool>
-  <string name="def_immersive_mode_confirmations" translatable="false">confirmed</string>
-</resources>
diff --git a/factory_common.mk b/factory_common.mk
deleted file mode 100644
index c5faafef..00000000
--- a/factory_common.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright 2020 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.
-#
-
-$(call inherit-product, device/google/gs101/aosp_common.mk)
-$(call inherit-product-if-exists, vendor/google_devices/gs101/factory/pixel/device-factory.mk)
-
-PRODUCT_PROPERTY_OVERRIDES += service.adb.root=1 \
-                              ro.vendor.factory=1 \
-                              ro.adb.secure=0
-
-# Factory Libraries of Audio
-PRODUCT_PACKAGES += audioroute libaudioroutelite
-
-# Enable fatp by default for factory builds
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    persist.vendor.camera.fatp.enable=1
-
-# Disable camera related features for factory builds
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.camera.partial_result_count=1 \
-    vendor.camera.debug.bypass_face_ssd_processor=1 \
-    vendor.camera.debug.enable_face_detection=0 \
-    vendor.camera.debug.force_dpm_on=0 \
-    vendor.camera.debug.force_eis_on=0 \
-    vendor.camera.debug.force_eaf_on=0 \
-    vendor.camera.debug.force_local_tone_mapping_on=0 \
-    vendor.camera.debug.force_mesh_warp_on=0 \
-    vendor.camera.debug.force_rectiface_node_on=0 \
-    vendor.camera.debug.force_steadiface_on=0 \
-    vendor.camera.debug.force_tnr_on=0 \
-    vendor.camera.debug.local_tone_mapping_controller_v1.mode=0 \
-    vendor.camera.debug.force_segmentation_node_on=0 \
-    vendor.camera.debug.enable_saliency=0
-
-# Disable ScreenDecorations for factory builds
-PRODUCT_PROPERTY_OVERRIDES += \
-    debug.disable_screen_decorations=true
-
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=80
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_touch_timer_ms=200
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_display_power_timer_ms=1000
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_for_refresh_rate=true
-
-# factory should always has SELinux permissive
-BOARD_BOOTCONFIG += androidboot.selinux=permissive
-BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
-
-# Disable Bluetooth as default in factory build
-DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay-factory
-
-PRODUCT_COPY_FILES += \
-    device/google/gs101/conf/init.factory.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.factory.rc
-
-# Add factory-friendly changes
-PRODUCT_PACKAGES += \
-        FactoryOverlaySettings \
-        FactoryOverlayLauncher3 \
-        FactoryOverlayFrameworkRes
-
-# Disable DebugFS restrictions in factory builds
-PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
-
-# PixelLogger for RF testing
-PRODUCT_PACKAGES_ENG += \
-    PixelLogger
-
-# Tool for installing Widevine keybox
-PRODUCT_PACKAGES_ENG += \
-    WvInstallKeybox
diff --git a/overlay-factory/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay-factory/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
deleted file mode 100644
index 3f3258f5..00000000
--- a/overlay-factory/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2009, 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.
- */
--->
-<resources>
-    <!-- Don't enable BT until user wants it -->
-    <bool name="def_bluetooth_on">false</bool>
-</resources>
-
diff --git a/overlay-factory/vendor/google/apps/PixelLogger/res/values/arrays.xml b/overlay-factory/vendor/google/apps/PixelLogger/res/values/arrays.xml
deleted file mode 100644
index 20a83653..00000000
--- a/overlay-factory/vendor/google/apps/PixelLogger/res/values/arrays.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-    <string-array name="logger_entries">
-        <item>shannondm</item>
-        <item>cnss_diag</item>
-        <item>brcm_gps</item>
-    </string-array>
-</resources>
diff --git a/overlay-factory/vendor/google/apps/PixelLogger/res/values/config.xml b/overlay-factory/vendor/google/apps/PixelLogger/res/values/config.xml
deleted file mode 100644
index ee2e1e81..00000000
--- a/overlay-factory/vendor/google/apps/PixelLogger/res/values/config.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="config_logger_default_value" translatable="false">shannondm</string>
-    <string name="config_cfg_default_value" translatable="false">Built-in Mask #1</string>
-
-    <!-- default config file for cnss_diag logger -->
-    <string name="config_cfg_default_value_cnss_diag" translatable="false">cnss_diag.conf</string>
-    <!-- config file to enable brcm gps logger -->
-    <bool name="config_brcm_gps_enabled" translatable="false">true</bool>
-</resources>
diff --git a/overlay-factory/vendor/google/apps/PixelLogger/res/values/configmessages.xml b/overlay-factory/vendor/google/apps/PixelLogger/res/values/configmessages.xml
deleted file mode 100644
index 578cfc57..00000000
--- a/overlay-factory/vendor/google/apps/PixelLogger/res/values/configmessages.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string-array name="config_message_no_message">
-    <item></item>
-  </string-array>
-  <string-array name="config_message_audio_warning">
-    <item>This will collect audio from your voice calls. Would you like to proceed?</item>
-  </string-array>
-  <string-array name="config_message_possible_audio_warning">
-    <item>This may collect audio from your voice calls. Would you like to proceed?</item>
-    <item>Pixel_Default.nprf</item>
-    <item>Built-in Mask #0</item>
-    <item>Built-in Mask #1</item>
-    <item>Built-in Mask #2</item>
-    <item>Built-in Mask #3</item>
-  </string-array>
-  <string name="config_privacy_warning_title">Privacy Warning</string>
-  <string name="default_config_selection_message">You are loading a user defined logging config. This may collect audio from your voice calls. Would you like to proceed?</string>
-</resources>