diff --git a/1/Android.bp b/1/Android.bp.auto
similarity index 100%
rename from 1/Android.bp
rename to 1/Android.bp.auto
diff --git a/current/Android.bp b/current/Android.bp
index 4138fa1..77be3f7 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -17,29 +17,6 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-prebuilt_bootclasspath_fragment {
-    name: "scheduling-sdk_com.android.scheduling-bootclasspath-fragment@current",
-    sdk_member_name: "com.android.scheduling-bootclasspath-fragment",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.scheduling"],
-    licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
-    contents: ["scheduling-sdk_framework-scheduling@current"],
-    fragments: [
-        {
-            apex: "com.android.art",
-            module: "art-bootclasspath-fragment",
-        },
-    ],
-    hidden_api: {
-        annotation_flags: "hiddenapi/annotation-flags.csv",
-        metadata: "hiddenapi/metadata.csv",
-        index: "hiddenapi/index.csv",
-        signature_patterns: "hiddenapi/signature-patterns.csv",
-        filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
-        filtered_flags: "hiddenapi/filtered-flags.csv",
-    },
-}
-
 module_prebuilt_bootclasspath_fragment {
     name: "com.android.scheduling-bootclasspath-fragment",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -69,40 +46,6 @@
     },
 }
 
-java_sdk_library_import {
-    name: "scheduling-sdk_framework-scheduling@current",
-    sdk_member_name: "framework-scheduling",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.scheduling"],
-    licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
-    shared_library: false,
-    permitted_packages: ["android.scheduling"],
-    public: {
-        jars: ["sdk_library/public/framework-scheduling-stubs.jar"],
-        stub_srcs: ["sdk_library/public/framework-scheduling.srcjar"],
-        current_api: "sdk_library/public/framework-scheduling.txt",
-        removed_api: "sdk_library/public/framework-scheduling-removed.txt",
-        annotations: "sdk_library/public/framework-scheduling_annotations.zip",
-        sdk_version: "module_current",
-    },
-    system: {
-        jars: ["sdk_library/system/framework-scheduling-stubs.jar"],
-        stub_srcs: ["sdk_library/system/framework-scheduling.srcjar"],
-        current_api: "sdk_library/system/framework-scheduling.txt",
-        removed_api: "sdk_library/system/framework-scheduling-removed.txt",
-        annotations: "sdk_library/system/framework-scheduling_annotations.zip",
-        sdk_version: "module_current",
-    },
-    module_lib: {
-        jars: ["sdk_library/module-lib/framework-scheduling-stubs.jar"],
-        stub_srcs: ["sdk_library/module-lib/framework-scheduling.srcjar"],
-        current_api: "sdk_library/module-lib/framework-scheduling.txt",
-        removed_api: "sdk_library/module-lib/framework-scheduling-removed.txt",
-        annotations: "sdk_library/module-lib/framework-scheduling_annotations.zip",
-        sdk_version: "module_current",
-    },
-}
-
 module_java_sdk_library_import {
     name: "framework-scheduling",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -143,15 +86,6 @@
     },
 }
 
-java_import {
-    name: "scheduling-sdk_service-scheduling@current",
-    sdk_member_name: "service-scheduling",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.scheduling"],
-    licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
-    jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-scheduling.jar"],
-}
-
 module_java_import {
     name: "service-scheduling",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -168,29 +102,12 @@
 }
 
 license {
-    name: "scheduling-sdk_Android-Apache-2.0@current",
-    sdk_member_name: "Android-Apache-2.0",
-    visibility: ["//visibility:private"],
-    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
-    license_text: ["licenses/build/soong/licenses/LICENSE"],
-}
-
-license {
     name: "scheduling-sdk_Android-Apache-2.0",
     visibility: ["//visibility:private"],
     license_kinds: ["SPDX-license-identifier-Apache-2.0"],
     license_text: ["licenses/build/soong/licenses/LICENSE"],
 }
 
-prebuilt_systemserverclasspath_fragment {
-    name: "scheduling-sdk_com.android.scheduling-systemserverclasspath-fragment@current",
-    sdk_member_name: "com.android.scheduling-systemserverclasspath-fragment",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.scheduling"],
-    licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
-    standalone_contents: ["scheduling-sdk_service-scheduling@current"],
-}
-
 module_prebuilt_systemserverclasspath_fragment {
     name: "com.android.scheduling-systemserverclasspath-fragment",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -205,12 +122,3 @@
     licenses: ["scheduling-sdk_Android-Apache-2.0"],
     standalone_contents: ["service-scheduling"],
 }
-
-sdk_snapshot {
-    name: "scheduling-sdk@current",
-    visibility: ["//visibility:public"],
-    bootclasspath_fragments: ["scheduling-sdk_com.android.scheduling-bootclasspath-fragment@current"],
-    java_sdk_libs: ["scheduling-sdk_framework-scheduling@current"],
-    java_systemserver_libs: ["scheduling-sdk_service-scheduling@current"],
-    systemserverclasspath_fragments: ["scheduling-sdk_com.android.scheduling-systemserverclasspath-fragment@current"],
-}