Update metalava from ab/9576127

- Hides all the empty kotlin facade classes

Relnote: N/A
Test: ./gradlew checkApi
Change-Id: I47760fc02e1ca4f077ba331dc51b48974fc2cff5
diff --git a/activity/activity-compose/api/1.7.0-beta01.txt b/activity/activity-compose/api/1.7.0-beta01.txt
index d51f9f5..ff9df4f 100644
--- a/activity/activity-compose/api/1.7.0-beta01.txt
+++ b/activity/activity-compose/api/1.7.0-beta01.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.activity.compose {
 
-  public final class ActivityComposeUtilsKt {
-  }
-
   public final class ActivityResultRegistryKt {
     method @androidx.compose.runtime.Composable public static <I, O> androidx.activity.compose.ManagedActivityResultLauncher<I,O> rememberLauncherForActivityResult(androidx.activity.result.contract.ActivityResultContract<I,O> contract, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> onResult);
   }
diff --git a/activity/activity-compose/api/current.ignore b/activity/activity-compose/api/current.ignore
new file mode 100644
index 0000000..a0610ef
--- /dev/null
+++ b/activity/activity-compose/api/current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.activity.compose.ActivityComposeUtilsKt:
+    Removed class androidx.activity.compose.ActivityComposeUtilsKt
diff --git a/activity/activity-compose/api/current.txt b/activity/activity-compose/api/current.txt
index d51f9f5..ff9df4f 100644
--- a/activity/activity-compose/api/current.txt
+++ b/activity/activity-compose/api/current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.activity.compose {
 
-  public final class ActivityComposeUtilsKt {
-  }
-
   public final class ActivityResultRegistryKt {
     method @androidx.compose.runtime.Composable public static <I, O> androidx.activity.compose.ManagedActivityResultLauncher<I,O> rememberLauncherForActivityResult(androidx.activity.result.contract.ActivityResultContract<I,O> contract, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> onResult);
   }
diff --git a/activity/activity-compose/api/public_plus_experimental_1.7.0-beta01.txt b/activity/activity-compose/api/public_plus_experimental_1.7.0-beta01.txt
index d51f9f5..ff9df4f 100644
--- a/activity/activity-compose/api/public_plus_experimental_1.7.0-beta01.txt
+++ b/activity/activity-compose/api/public_plus_experimental_1.7.0-beta01.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.activity.compose {
 
-  public final class ActivityComposeUtilsKt {
-  }
-
   public final class ActivityResultRegistryKt {
     method @androidx.compose.runtime.Composable public static <I, O> androidx.activity.compose.ManagedActivityResultLauncher<I,O> rememberLauncherForActivityResult(androidx.activity.result.contract.ActivityResultContract<I,O> contract, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> onResult);
   }
diff --git a/activity/activity-compose/api/public_plus_experimental_current.txt b/activity/activity-compose/api/public_plus_experimental_current.txt
index d51f9f5..ff9df4f 100644
--- a/activity/activity-compose/api/public_plus_experimental_current.txt
+++ b/activity/activity-compose/api/public_plus_experimental_current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.activity.compose {
 
-  public final class ActivityComposeUtilsKt {
-  }
-
   public final class ActivityResultRegistryKt {
     method @androidx.compose.runtime.Composable public static <I, O> androidx.activity.compose.ManagedActivityResultLauncher<I,O> rememberLauncherForActivityResult(androidx.activity.result.contract.ActivityResultContract<I,O> contract, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> onResult);
   }
diff --git a/activity/activity-compose/api/restricted_1.7.0-beta01.txt b/activity/activity-compose/api/restricted_1.7.0-beta01.txt
index d51f9f5..ff9df4f 100644
--- a/activity/activity-compose/api/restricted_1.7.0-beta01.txt
+++ b/activity/activity-compose/api/restricted_1.7.0-beta01.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.activity.compose {
 
-  public final class ActivityComposeUtilsKt {
-  }
-
   public final class ActivityResultRegistryKt {
     method @androidx.compose.runtime.Composable public static <I, O> androidx.activity.compose.ManagedActivityResultLauncher<I,O> rememberLauncherForActivityResult(androidx.activity.result.contract.ActivityResultContract<I,O> contract, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> onResult);
   }
diff --git a/activity/activity-compose/api/restricted_current.ignore b/activity/activity-compose/api/restricted_current.ignore
new file mode 100644
index 0000000..a0610ef
--- /dev/null
+++ b/activity/activity-compose/api/restricted_current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.activity.compose.ActivityComposeUtilsKt:
+    Removed class androidx.activity.compose.ActivityComposeUtilsKt
diff --git a/activity/activity-compose/api/restricted_current.txt b/activity/activity-compose/api/restricted_current.txt
index d51f9f5..ff9df4f 100644
--- a/activity/activity-compose/api/restricted_current.txt
+++ b/activity/activity-compose/api/restricted_current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.activity.compose {
 
-  public final class ActivityComposeUtilsKt {
-  }
-
   public final class ActivityResultRegistryKt {
     method @androidx.compose.runtime.Composable public static <I, O> androidx.activity.compose.ManagedActivityResultLauncher<I,O> rememberLauncherForActivityResult(androidx.activity.result.contract.ActivityResultContract<I,O> contract, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> onResult);
   }
diff --git a/benchmark/benchmark-common/api/current.ignore b/benchmark/benchmark-common/api/current.ignore
new file mode 100644
index 0000000..a2a7089
--- /dev/null
+++ b/benchmark/benchmark-common/api/current.ignore
@@ -0,0 +1,13 @@
+// Baseline format: 1.0
+RemovedClass: androidx.benchmark.Api21Kt:
+    Removed class androidx.benchmark.Api21Kt
+RemovedClass: androidx.benchmark.Api24Kt:
+    Removed class androidx.benchmark.Api24Kt
+RemovedClass: androidx.benchmark.Api27Kt:
+    Removed class androidx.benchmark.Api27Kt
+RemovedClass: androidx.benchmark.Api29Kt:
+    Removed class androidx.benchmark.Api29Kt
+RemovedClass: androidx.benchmark.MetricNameUtilsKt:
+    Removed class androidx.benchmark.MetricNameUtilsKt
+RemovedClass: androidx.benchmark.ProfilerKt:
+    Removed class androidx.benchmark.ProfilerKt
diff --git a/benchmark/benchmark-common/api/current.txt b/benchmark/benchmark-common/api/current.txt
index 421c7d0..38c42d4 100644
--- a/benchmark/benchmark-common/api/current.txt
+++ b/benchmark/benchmark-common/api/current.txt
@@ -1,18 +1,6 @@
 // Signature format: 4.0
 package androidx.benchmark {
 
-  @RequiresApi(21) public final class Api21Kt {
-  }
-
-  @RequiresApi(24) public final class Api24Kt {
-  }
-
-  @RequiresApi(27) public final class Api27Kt {
-  }
-
-  @RequiresApi(29) public final class Api29Kt {
-  }
-
   public final class ArgumentsKt {
   }
 
@@ -29,15 +17,6 @@
   public final class ConfigurationErrorKt {
   }
 
-  public final class MetricNameUtilsKt {
-  }
-
-  public final class ProfilerKt {
-  }
-
-  public final class ShellKt {
-  }
-
   public final class UserspaceTracingKt {
   }
 
diff --git a/benchmark/benchmark-common/api/public_plus_experimental_current.txt b/benchmark/benchmark-common/api/public_plus_experimental_current.txt
index 07ca9f6..313b2c0 100644
--- a/benchmark/benchmark-common/api/public_plus_experimental_current.txt
+++ b/benchmark/benchmark-common/api/public_plus_experimental_current.txt
@@ -1,18 +1,6 @@
 // Signature format: 4.0
 package androidx.benchmark {
 
-  @RequiresApi(21) public final class Api21Kt {
-  }
-
-  @RequiresApi(24) public final class Api24Kt {
-  }
-
-  @RequiresApi(27) public final class Api27Kt {
-  }
-
-  @RequiresApi(29) public final class Api29Kt {
-  }
-
   public final class ArgumentsKt {
   }
 
@@ -39,15 +27,6 @@
   @kotlin.RequiresOptIn @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalBenchmarkStateApi {
   }
 
-  public final class MetricNameUtilsKt {
-  }
-
-  public final class ProfilerKt {
-  }
-
-  public final class ShellKt {
-  }
-
   public final class UserspaceTracingKt {
   }
 
diff --git a/benchmark/benchmark-common/api/restricted_current.ignore b/benchmark/benchmark-common/api/restricted_current.ignore
new file mode 100644
index 0000000..a2a7089
--- /dev/null
+++ b/benchmark/benchmark-common/api/restricted_current.ignore
@@ -0,0 +1,13 @@
+// Baseline format: 1.0
+RemovedClass: androidx.benchmark.Api21Kt:
+    Removed class androidx.benchmark.Api21Kt
+RemovedClass: androidx.benchmark.Api24Kt:
+    Removed class androidx.benchmark.Api24Kt
+RemovedClass: androidx.benchmark.Api27Kt:
+    Removed class androidx.benchmark.Api27Kt
+RemovedClass: androidx.benchmark.Api29Kt:
+    Removed class androidx.benchmark.Api29Kt
+RemovedClass: androidx.benchmark.MetricNameUtilsKt:
+    Removed class androidx.benchmark.MetricNameUtilsKt
+RemovedClass: androidx.benchmark.ProfilerKt:
+    Removed class androidx.benchmark.ProfilerKt
diff --git a/benchmark/benchmark-common/api/restricted_current.txt b/benchmark/benchmark-common/api/restricted_current.txt
index eb3307a..752b162 100644
--- a/benchmark/benchmark-common/api/restricted_current.txt
+++ b/benchmark/benchmark-common/api/restricted_current.txt
@@ -1,18 +1,6 @@
 // Signature format: 4.0
 package androidx.benchmark {
 
-  @RequiresApi(21) public final class Api21Kt {
-  }
-
-  @RequiresApi(24) public final class Api24Kt {
-  }
-
-  @RequiresApi(27) public final class Api27Kt {
-  }
-
-  @RequiresApi(29) public final class Api29Kt {
-  }
-
   public final class ArgumentsKt {
   }
 
@@ -31,15 +19,6 @@
   public final class ConfigurationErrorKt {
   }
 
-  public final class MetricNameUtilsKt {
-  }
-
-  public final class ProfilerKt {
-  }
-
-  public final class ShellKt {
-  }
-
   public final class UserspaceTracingKt {
   }
 
diff --git a/benchmark/benchmark-macro/api/current.ignore b/benchmark/benchmark-macro/api/current.ignore
new file mode 100644
index 0000000..d3ebf7c
--- /dev/null
+++ b/benchmark/benchmark-macro/api/current.ignore
@@ -0,0 +1,17 @@
+// Baseline format: 1.0
+RemovedClass: androidx.benchmark.macro.Api29Kt:
+    Removed class androidx.benchmark.macro.Api29Kt
+RemovedClass: androidx.benchmark.macro.IdeSummaryStringKt:
+    Removed class androidx.benchmark.macro.IdeSummaryStringKt
+RemovedClass: androidx.benchmark.macro.IterationResultKt:
+    Removed class androidx.benchmark.macro.IterationResultKt
+RemovedClass: androidx.benchmark.macro.MetricKt:
+    Removed class androidx.benchmark.macro.MetricKt
+RemovedClass: androidx.benchmark.macro.MetricResultExtensionsKt:
+    Removed class androidx.benchmark.macro.MetricResultExtensionsKt
+RemovedClass: androidx.benchmark.macro.TagKt:
+    Removed class androidx.benchmark.macro.TagKt
+
+
+RemovedPackage: androidx.benchmark.macro.perfetto:
+    Removed package androidx.benchmark.macro.perfetto
diff --git a/benchmark/benchmark-macro/api/current.txt b/benchmark/benchmark-macro/api/current.txt
index 7840107..a52d9ae 100644
--- a/benchmark/benchmark-macro/api/current.txt
+++ b/benchmark/benchmark-macro/api/current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.benchmark.macro {
 
-  @RequiresApi(29) public final class Api29Kt {
-  }
-
   public enum BaselineProfileMode {
     method public static androidx.benchmark.macro.BaselineProfileMode valueOf(String name) throws java.lang.IllegalArgumentException;
     method public static androidx.benchmark.macro.BaselineProfileMode[] values();
@@ -48,12 +45,6 @@
     ctor public FrameTimingMetric();
   }
 
-  public final class IdeSummaryStringKt {
-  }
-
-  public final class IterationResultKt {
-  }
-
   public final class MacrobenchmarkKt {
   }
 
@@ -79,12 +70,6 @@
   public abstract sealed class Metric {
   }
 
-  public final class MetricKt {
-  }
-
-  public final class MetricResultExtensionsKt {
-  }
-
   public enum StartupMode {
     method public static androidx.benchmark.macro.StartupMode valueOf(String name) throws java.lang.IllegalArgumentException;
     method public static androidx.benchmark.macro.StartupMode[] values();
@@ -97,24 +82,5 @@
     ctor public StartupTimingMetric();
   }
 
-  public final class TagKt {
-  }
-
-}
-
-package androidx.benchmark.macro.perfetto {
-
-  public final class ForceTracingKt {
-  }
-
-  public final class PerfettoTraceProcessorKt {
-  }
-
-  public final class SliceKt {
-  }
-
-  public final class StringHelperKt {
-  }
-
 }
 
diff --git a/benchmark/benchmark-macro/api/public_plus_experimental_current.txt b/benchmark/benchmark-macro/api/public_plus_experimental_current.txt
index 8f5b8c0..c83f76f 100644
--- a/benchmark/benchmark-macro/api/public_plus_experimental_current.txt
+++ b/benchmark/benchmark-macro/api/public_plus_experimental_current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.benchmark.macro {
 
-  @RequiresApi(29) public final class Api29Kt {
-  }
-
   @androidx.benchmark.macro.ExperimentalMetricApi public final class AudioUnderrunMetric extends androidx.benchmark.macro.Metric {
     ctor public AudioUnderrunMetric();
   }
@@ -65,12 +62,6 @@
     ctor public FrameTimingMetric();
   }
 
-  public final class IdeSummaryStringKt {
-  }
-
-  public final class IterationResultKt {
-  }
-
   public final class MacrobenchmarkKt {
   }
 
@@ -96,12 +87,6 @@
   public abstract sealed class Metric {
   }
 
-  public final class MetricKt {
-  }
-
-  public final class MetricResultExtensionsKt {
-  }
-
   @androidx.benchmark.macro.ExperimentalMetricApi public enum PowerCategory {
     method public static androidx.benchmark.macro.PowerCategory valueOf(String name) throws java.lang.IllegalArgumentException;
     method public static androidx.benchmark.macro.PowerCategory[] values();
@@ -166,9 +151,6 @@
     ctor public StartupTimingMetric();
   }
 
-  public final class TagKt {
-  }
-
   @androidx.benchmark.macro.ExperimentalMetricApi public final class TraceSectionMetric extends androidx.benchmark.macro.Metric {
     ctor public TraceSectionMetric(String sectionName, optional androidx.benchmark.macro.TraceSectionMetric.Mode mode);
   }
@@ -182,19 +164,3 @@
 
 }
 
-package androidx.benchmark.macro.perfetto {
-
-  public final class ForceTracingKt {
-  }
-
-  public final class PerfettoTraceProcessorKt {
-  }
-
-  public final class SliceKt {
-  }
-
-  public final class StringHelperKt {
-  }
-
-}
-
diff --git a/benchmark/benchmark-macro/api/restricted_current.ignore b/benchmark/benchmark-macro/api/restricted_current.ignore
index 809ffe7..17a4adc 100644
--- a/benchmark/benchmark-macro/api/restricted_current.ignore
+++ b/benchmark/benchmark-macro/api/restricted_current.ignore
@@ -1,7 +1,23 @@
 // Baseline format: 1.0
+RemovedClass: androidx.benchmark.macro.Api29Kt:
+    Removed class androidx.benchmark.macro.Api29Kt
 RemovedClass: androidx.benchmark.macro.FrameTimingGfxInfoMetric:
     Removed class androidx.benchmark.macro.FrameTimingGfxInfoMetric
+RemovedClass: androidx.benchmark.macro.IdeSummaryStringKt:
+    Removed class androidx.benchmark.macro.IdeSummaryStringKt
+RemovedClass: androidx.benchmark.macro.IterationResultKt:
+    Removed class androidx.benchmark.macro.IterationResultKt
+RemovedClass: androidx.benchmark.macro.MetricKt:
+    Removed class androidx.benchmark.macro.MetricKt
+RemovedClass: androidx.benchmark.macro.MetricResultExtensionsKt:
+    Removed class androidx.benchmark.macro.MetricResultExtensionsKt
+RemovedClass: androidx.benchmark.macro.TagKt:
+    Removed class androidx.benchmark.macro.TagKt
 
 
 RemovedMethod: androidx.benchmark.macro.BaselineProfilesKt#collectBaselineProfile(String, String, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit>):
     Removed method androidx.benchmark.macro.BaselineProfilesKt.collectBaselineProfile(String,String,kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit>)
+
+
+RemovedPackage: androidx.benchmark.macro.perfetto:
+    Removed package androidx.benchmark.macro.perfetto
diff --git a/benchmark/benchmark-macro/api/restricted_current.txt b/benchmark/benchmark-macro/api/restricted_current.txt
index 91151e5..4de13a2 100644
--- a/benchmark/benchmark-macro/api/restricted_current.txt
+++ b/benchmark/benchmark-macro/api/restricted_current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.benchmark.macro {
 
-  @RequiresApi(29) public final class Api29Kt {
-  }
-
   public enum BaselineProfileMode {
     method public static androidx.benchmark.macro.BaselineProfileMode valueOf(String name) throws java.lang.IllegalArgumentException;
     method public static androidx.benchmark.macro.BaselineProfileMode[] values();
@@ -59,12 +56,6 @@
     ctor public FrameTimingMetric();
   }
 
-  public final class IdeSummaryStringKt {
-  }
-
-  public final class IterationResultKt {
-  }
-
   public final class MacrobenchmarkKt {
   }
 
@@ -90,12 +81,6 @@
   public abstract sealed class Metric {
   }
 
-  public final class MetricKt {
-  }
-
-  public final class MetricResultExtensionsKt {
-  }
-
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class PowerRail {
     method public boolean hasMetrics(optional boolean throwOnMissingMetrics);
     field public static final androidx.benchmark.macro.PowerRail INSTANCE;
@@ -117,24 +102,5 @@
     ctor public StartupTimingMetric();
   }
 
-  public final class TagKt {
-  }
-
-}
-
-package androidx.benchmark.macro.perfetto {
-
-  public final class ForceTracingKt {
-  }
-
-  public final class PerfettoTraceProcessorKt {
-  }
-
-  public final class SliceKt {
-  }
-
-  public final class StringHelperKt {
-  }
-
 }
 
diff --git a/collection/collection/api/current.txt b/collection/collection/api/current.txt
index 9697918..19c0d55 100644
--- a/collection/collection/api/current.txt
+++ b/collection/collection/api/current.txt
@@ -187,9 +187,6 @@
     method public V! valueAt(int index);
   }
 
-  public final class SimpleArrayMapKt {
-  }
-
   public class SparseArrayCompat<E> implements java.lang.Cloneable {
     ctor public SparseArrayCompat(optional int initialCapacity);
     ctor public SparseArrayCompat();
@@ -221,9 +218,6 @@
     property public final boolean isEmpty;
   }
 
-  public final class SparseArrayCompatKt {
-  }
-
   public final class SparseArrayKt {
     method public static inline operator <T> boolean contains(androidx.collection.SparseArrayCompat<T>, int key);
     method public static inline <T> void forEach(androidx.collection.SparseArrayCompat<T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
@@ -240,13 +234,3 @@
 
 }
 
-package androidx.collection.internal {
-
-  public final class ContainerHelpersKt {
-  }
-
-  public final class LockExtKt {
-  }
-
-}
-
diff --git a/collection/collection/api/public_plus_experimental_current.txt b/collection/collection/api/public_plus_experimental_current.txt
index 9697918..19c0d55 100644
--- a/collection/collection/api/public_plus_experimental_current.txt
+++ b/collection/collection/api/public_plus_experimental_current.txt
@@ -187,9 +187,6 @@
     method public V! valueAt(int index);
   }
 
-  public final class SimpleArrayMapKt {
-  }
-
   public class SparseArrayCompat<E> implements java.lang.Cloneable {
     ctor public SparseArrayCompat(optional int initialCapacity);
     ctor public SparseArrayCompat();
@@ -221,9 +218,6 @@
     property public final boolean isEmpty;
   }
 
-  public final class SparseArrayCompatKt {
-  }
-
   public final class SparseArrayKt {
     method public static inline operator <T> boolean contains(androidx.collection.SparseArrayCompat<T>, int key);
     method public static inline <T> void forEach(androidx.collection.SparseArrayCompat<T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
@@ -240,13 +234,3 @@
 
 }
 
-package androidx.collection.internal {
-
-  public final class ContainerHelpersKt {
-  }
-
-  public final class LockExtKt {
-  }
-
-}
-
diff --git a/collection/collection/api/restricted_current.txt b/collection/collection/api/restricted_current.txt
index 9697918..19c0d55 100644
--- a/collection/collection/api/restricted_current.txt
+++ b/collection/collection/api/restricted_current.txt
@@ -187,9 +187,6 @@
     method public V! valueAt(int index);
   }
 
-  public final class SimpleArrayMapKt {
-  }
-
   public class SparseArrayCompat<E> implements java.lang.Cloneable {
     ctor public SparseArrayCompat(optional int initialCapacity);
     ctor public SparseArrayCompat();
@@ -221,9 +218,6 @@
     property public final boolean isEmpty;
   }
 
-  public final class SparseArrayCompatKt {
-  }
-
   public final class SparseArrayKt {
     method public static inline operator <T> boolean contains(androidx.collection.SparseArrayCompat<T>, int key);
     method public static inline <T> void forEach(androidx.collection.SparseArrayCompat<T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
@@ -240,13 +234,3 @@
 
 }
 
-package androidx.collection.internal {
-
-  public final class ContainerHelpersKt {
-  }
-
-  public final class LockExtKt {
-  }
-
-}
-
diff --git a/compose/animation/animation-core/api/1.4.0-beta01.txt b/compose/animation/animation-core/api/1.4.0-beta01.txt
index 26d75c7..06524e6 100644
--- a/compose/animation/animation-core/api/1.4.0-beta01.txt
+++ b/compose/animation/animation-core/api/1.4.0-beta01.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.animation.core {
 
-  public final class ActualJvmKt {
-  }
-
   public final class Animatable<T, V extends androidx.compose.animation.core.AnimationVector> {
     ctor public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold, optional String label);
     ctor @Deprecated public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold);
@@ -210,9 +207,6 @@
     method public static androidx.compose.animation.core.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
   }
 
-  public final class ComplexDoubleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class CubicBezierEasing implements androidx.compose.animation.core.Easing {
     ctor public CubicBezierEasing(float a, float b, float c, float d);
     method public float transform(float fraction);
@@ -360,9 +354,6 @@
     property public abstract float absVelocityThreshold;
   }
 
-  public final class FloatDecayAnimationSpecKt {
-  }
-
   public final class FloatExponentialDecaySpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
     ctor public FloatExponentialDecaySpec(optional float frictionMultiplier, optional float absVelocityThreshold);
     method public float getAbsVelocityThreshold();
@@ -520,9 +511,6 @@
   public final class SpringEstimationKt {
   }
 
-  public final class SpringSimulationKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SpringSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
     ctor public SpringSpec(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
     method public float getDampingRatio();
@@ -671,9 +659,6 @@
     property public abstract boolean isInfinite;
   }
 
-  public final class VectorizedAnimationSpecKt {
-  }
-
   public interface VectorizedDecayAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
     method public float getAbsVelocityThreshold();
     method public long getDurationNanos(V initialValue, V initialVelocity);
@@ -774,10 +759,3 @@
 
 }
 
-package androidx.compose.animation.core.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/animation/animation-core/api/current.ignore b/compose/animation/animation-core/api/current.ignore
index ae54e41..f7336f7 100644
--- a/compose/animation/animation-core/api/current.ignore
+++ b/compose/animation/animation-core/api/current.ignore
@@ -3,3 +3,19 @@
     Method androidx.compose.animation.core.InfiniteTransitionKt.animateFloat has changed return type from androidx.compose.runtime.State<java.lang.Float> to androidx.compose.runtime.State<? extends java.lang.Float>
 ChangedType: androidx.compose.animation.core.InfiniteTransitionKt#animateValue(androidx.compose.animation.core.InfiniteTransition, T, T, androidx.compose.animation.core.TwoWayConverter<T,V>, androidx.compose.animation.core.InfiniteRepeatableSpec<T>):
     Method androidx.compose.animation.core.InfiniteTransitionKt.animateValue has changed return type from androidx.compose.runtime.State<T> to androidx.compose.runtime.State<? extends T>
+
+
+RemovedClass: androidx.compose.animation.core.ActualJvmKt:
+    Removed class androidx.compose.animation.core.ActualJvmKt
+RemovedClass: androidx.compose.animation.core.ComplexDoubleKt:
+    Removed class androidx.compose.animation.core.ComplexDoubleKt
+RemovedClass: androidx.compose.animation.core.FloatDecayAnimationSpecKt:
+    Removed class androidx.compose.animation.core.FloatDecayAnimationSpecKt
+RemovedClass: androidx.compose.animation.core.SpringSimulationKt:
+    Removed class androidx.compose.animation.core.SpringSimulationKt
+RemovedClass: androidx.compose.animation.core.VectorizedAnimationSpecKt:
+    Removed class androidx.compose.animation.core.VectorizedAnimationSpecKt
+
+
+RemovedPackage: androidx.compose.animation.core.internal:
+    Removed package androidx.compose.animation.core.internal
diff --git a/compose/animation/animation-core/api/current.txt b/compose/animation/animation-core/api/current.txt
index 26d75c7..06524e6 100644
--- a/compose/animation/animation-core/api/current.txt
+++ b/compose/animation/animation-core/api/current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.animation.core {
 
-  public final class ActualJvmKt {
-  }
-
   public final class Animatable<T, V extends androidx.compose.animation.core.AnimationVector> {
     ctor public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold, optional String label);
     ctor @Deprecated public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold);
@@ -210,9 +207,6 @@
     method public static androidx.compose.animation.core.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
   }
 
-  public final class ComplexDoubleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class CubicBezierEasing implements androidx.compose.animation.core.Easing {
     ctor public CubicBezierEasing(float a, float b, float c, float d);
     method public float transform(float fraction);
@@ -360,9 +354,6 @@
     property public abstract float absVelocityThreshold;
   }
 
-  public final class FloatDecayAnimationSpecKt {
-  }
-
   public final class FloatExponentialDecaySpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
     ctor public FloatExponentialDecaySpec(optional float frictionMultiplier, optional float absVelocityThreshold);
     method public float getAbsVelocityThreshold();
@@ -520,9 +511,6 @@
   public final class SpringEstimationKt {
   }
 
-  public final class SpringSimulationKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SpringSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
     ctor public SpringSpec(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
     method public float getDampingRatio();
@@ -671,9 +659,6 @@
     property public abstract boolean isInfinite;
   }
 
-  public final class VectorizedAnimationSpecKt {
-  }
-
   public interface VectorizedDecayAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
     method public float getAbsVelocityThreshold();
     method public long getDurationNanos(V initialValue, V initialVelocity);
@@ -774,10 +759,3 @@
 
 }
 
-package androidx.compose.animation.core.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/animation/animation-core/api/public_plus_experimental_1.4.0-beta01.txt b/compose/animation/animation-core/api/public_plus_experimental_1.4.0-beta01.txt
index 230d118..60b552a 100644
--- a/compose/animation/animation-core/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/animation/animation-core/api/public_plus_experimental_1.4.0-beta01.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.animation.core {
 
-  public final class ActualJvmKt {
-  }
-
   public final class Animatable<T, V extends androidx.compose.animation.core.AnimationVector> {
     ctor public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold, optional String label);
     ctor @Deprecated public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold);
@@ -210,9 +207,6 @@
     method public static androidx.compose.animation.core.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
   }
 
-  public final class ComplexDoubleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class CubicBezierEasing implements androidx.compose.animation.core.Easing {
     ctor public CubicBezierEasing(float a, float b, float c, float d);
     method public float transform(float fraction);
@@ -363,9 +357,6 @@
     property public abstract float absVelocityThreshold;
   }
 
-  public final class FloatDecayAnimationSpecKt {
-  }
-
   public final class FloatExponentialDecaySpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
     ctor public FloatExponentialDecaySpec(optional float frictionMultiplier, optional float absVelocityThreshold);
     method public float getAbsVelocityThreshold();
@@ -526,9 +517,6 @@
   public final class SpringEstimationKt {
   }
 
-  public final class SpringSimulationKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SpringSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
     ctor public SpringSpec(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
     method public float getDampingRatio();
@@ -678,9 +666,6 @@
     property public abstract boolean isInfinite;
   }
 
-  public final class VectorizedAnimationSpecKt {
-  }
-
   public interface VectorizedDecayAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
     method public float getAbsVelocityThreshold();
     method public long getDurationNanos(V initialValue, V initialVelocity);
@@ -781,10 +766,3 @@
 
 }
 
-package androidx.compose.animation.core.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/animation/animation-core/api/public_plus_experimental_current.txt b/compose/animation/animation-core/api/public_plus_experimental_current.txt
index 230d118..60b552a 100644
--- a/compose/animation/animation-core/api/public_plus_experimental_current.txt
+++ b/compose/animation/animation-core/api/public_plus_experimental_current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.animation.core {
 
-  public final class ActualJvmKt {
-  }
-
   public final class Animatable<T, V extends androidx.compose.animation.core.AnimationVector> {
     ctor public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold, optional String label);
     ctor @Deprecated public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold);
@@ -210,9 +207,6 @@
     method public static androidx.compose.animation.core.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
   }
 
-  public final class ComplexDoubleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class CubicBezierEasing implements androidx.compose.animation.core.Easing {
     ctor public CubicBezierEasing(float a, float b, float c, float d);
     method public float transform(float fraction);
@@ -363,9 +357,6 @@
     property public abstract float absVelocityThreshold;
   }
 
-  public final class FloatDecayAnimationSpecKt {
-  }
-
   public final class FloatExponentialDecaySpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
     ctor public FloatExponentialDecaySpec(optional float frictionMultiplier, optional float absVelocityThreshold);
     method public float getAbsVelocityThreshold();
@@ -526,9 +517,6 @@
   public final class SpringEstimationKt {
   }
 
-  public final class SpringSimulationKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SpringSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
     ctor public SpringSpec(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
     method public float getDampingRatio();
@@ -678,9 +666,6 @@
     property public abstract boolean isInfinite;
   }
 
-  public final class VectorizedAnimationSpecKt {
-  }
-
   public interface VectorizedDecayAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
     method public float getAbsVelocityThreshold();
     method public long getDurationNanos(V initialValue, V initialVelocity);
@@ -781,10 +766,3 @@
 
 }
 
-package androidx.compose.animation.core.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/animation/animation-core/api/restricted_1.4.0-beta01.txt b/compose/animation/animation-core/api/restricted_1.4.0-beta01.txt
index 7e756ae..9863fd5 100644
--- a/compose/animation/animation-core/api/restricted_1.4.0-beta01.txt
+++ b/compose/animation/animation-core/api/restricted_1.4.0-beta01.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.animation.core {
 
-  public final class ActualJvmKt {
-  }
-
   public final class Animatable<T, V extends androidx.compose.animation.core.AnimationVector> {
     ctor public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold, optional String label);
     ctor @Deprecated public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold);
@@ -210,9 +207,6 @@
     method public static androidx.compose.animation.core.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
   }
 
-  public final class ComplexDoubleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class CubicBezierEasing implements androidx.compose.animation.core.Easing {
     ctor public CubicBezierEasing(float a, float b, float c, float d);
     method public float transform(float fraction);
@@ -360,9 +354,6 @@
     property public abstract float absVelocityThreshold;
   }
 
-  public final class FloatDecayAnimationSpecKt {
-  }
-
   public final class FloatExponentialDecaySpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
     ctor public FloatExponentialDecaySpec(optional float frictionMultiplier, optional float absVelocityThreshold);
     method public float getAbsVelocityThreshold();
@@ -520,9 +511,6 @@
   public final class SpringEstimationKt {
   }
 
-  public final class SpringSimulationKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SpringSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
     ctor public SpringSpec(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
     method public float getDampingRatio();
@@ -674,9 +662,6 @@
     property public abstract boolean isInfinite;
   }
 
-  public final class VectorizedAnimationSpecKt {
-  }
-
   public interface VectorizedDecayAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
     method public float getAbsVelocityThreshold();
     method public long getDurationNanos(V initialValue, V initialVelocity);
@@ -777,10 +762,3 @@
 
 }
 
-package androidx.compose.animation.core.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/animation/animation-core/api/restricted_current.ignore b/compose/animation/animation-core/api/restricted_current.ignore
index ae54e41..f7336f7 100644
--- a/compose/animation/animation-core/api/restricted_current.ignore
+++ b/compose/animation/animation-core/api/restricted_current.ignore
@@ -3,3 +3,19 @@
     Method androidx.compose.animation.core.InfiniteTransitionKt.animateFloat has changed return type from androidx.compose.runtime.State<java.lang.Float> to androidx.compose.runtime.State<? extends java.lang.Float>
 ChangedType: androidx.compose.animation.core.InfiniteTransitionKt#animateValue(androidx.compose.animation.core.InfiniteTransition, T, T, androidx.compose.animation.core.TwoWayConverter<T,V>, androidx.compose.animation.core.InfiniteRepeatableSpec<T>):
     Method androidx.compose.animation.core.InfiniteTransitionKt.animateValue has changed return type from androidx.compose.runtime.State<T> to androidx.compose.runtime.State<? extends T>
+
+
+RemovedClass: androidx.compose.animation.core.ActualJvmKt:
+    Removed class androidx.compose.animation.core.ActualJvmKt
+RemovedClass: androidx.compose.animation.core.ComplexDoubleKt:
+    Removed class androidx.compose.animation.core.ComplexDoubleKt
+RemovedClass: androidx.compose.animation.core.FloatDecayAnimationSpecKt:
+    Removed class androidx.compose.animation.core.FloatDecayAnimationSpecKt
+RemovedClass: androidx.compose.animation.core.SpringSimulationKt:
+    Removed class androidx.compose.animation.core.SpringSimulationKt
+RemovedClass: androidx.compose.animation.core.VectorizedAnimationSpecKt:
+    Removed class androidx.compose.animation.core.VectorizedAnimationSpecKt
+
+
+RemovedPackage: androidx.compose.animation.core.internal:
+    Removed package androidx.compose.animation.core.internal
diff --git a/compose/animation/animation-core/api/restricted_current.txt b/compose/animation/animation-core/api/restricted_current.txt
index 7e756ae..9863fd5 100644
--- a/compose/animation/animation-core/api/restricted_current.txt
+++ b/compose/animation/animation-core/api/restricted_current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.animation.core {
 
-  public final class ActualJvmKt {
-  }
-
   public final class Animatable<T, V extends androidx.compose.animation.core.AnimationVector> {
     ctor public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold, optional String label);
     ctor @Deprecated public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold);
@@ -210,9 +207,6 @@
     method public static androidx.compose.animation.core.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
   }
 
-  public final class ComplexDoubleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class CubicBezierEasing implements androidx.compose.animation.core.Easing {
     ctor public CubicBezierEasing(float a, float b, float c, float d);
     method public float transform(float fraction);
@@ -360,9 +354,6 @@
     property public abstract float absVelocityThreshold;
   }
 
-  public final class FloatDecayAnimationSpecKt {
-  }
-
   public final class FloatExponentialDecaySpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
     ctor public FloatExponentialDecaySpec(optional float frictionMultiplier, optional float absVelocityThreshold);
     method public float getAbsVelocityThreshold();
@@ -520,9 +511,6 @@
   public final class SpringEstimationKt {
   }
 
-  public final class SpringSimulationKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SpringSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
     ctor public SpringSpec(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
     method public float getDampingRatio();
@@ -674,9 +662,6 @@
     property public abstract boolean isInfinite;
   }
 
-  public final class VectorizedAnimationSpecKt {
-  }
-
   public interface VectorizedDecayAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
     method public float getAbsVelocityThreshold();
     method public long getDurationNanos(V initialValue, V initialVelocity);
@@ -777,10 +762,3 @@
 
 }
 
-package androidx.compose.animation.core.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/animation/animation-graphics/api/1.4.0-beta01.txt b/compose/animation/animation-graphics/api/1.4.0-beta01.txt
index 9c4ad0e..22d9fe9 100644
--- a/compose/animation/animation-graphics/api/1.4.0-beta01.txt
+++ b/compose/animation/animation-graphics/api/1.4.0-beta01.txt
@@ -7,31 +7,5 @@
   public final class AnimatedVectorResources_androidKt {
   }
 
-  public final class AnimatorResources_androidKt {
-  }
-
-}
-
-package androidx.compose.animation.graphics.vector {
-
-  public final class AnimatorAnimationSpecsKt {
-  }
-
-  public final class AnimatorKt {
-  }
-
-}
-
-package androidx.compose.animation.graphics.vector.compat {
-
-  public final class XmlAnimatedVectorParser_androidKt {
-  }
-
-  public final class XmlAnimatorParser_androidKt {
-  }
-
-  public final class XmlPullParserUtils_androidKt {
-  }
-
 }
 
diff --git a/compose/animation/animation-graphics/api/current.ignore b/compose/animation/animation-graphics/api/current.ignore
new file mode 100644
index 0000000..aa10076
--- /dev/null
+++ b/compose/animation/animation-graphics/api/current.ignore
@@ -0,0 +1,9 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.animation.graphics.res.AnimatorResources_androidKt:
+    Removed class androidx.compose.animation.graphics.res.AnimatorResources_androidKt
+
+
+RemovedPackage: androidx.compose.animation.graphics.vector:
+    Removed package androidx.compose.animation.graphics.vector
+RemovedPackage: androidx.compose.animation.graphics.vector.compat:
+    Removed package androidx.compose.animation.graphics.vector.compat
diff --git a/compose/animation/animation-graphics/api/current.txt b/compose/animation/animation-graphics/api/current.txt
index 9c4ad0e..22d9fe9 100644
--- a/compose/animation/animation-graphics/api/current.txt
+++ b/compose/animation/animation-graphics/api/current.txt
@@ -7,31 +7,5 @@
   public final class AnimatedVectorResources_androidKt {
   }
 
-  public final class AnimatorResources_androidKt {
-  }
-
-}
-
-package androidx.compose.animation.graphics.vector {
-
-  public final class AnimatorAnimationSpecsKt {
-  }
-
-  public final class AnimatorKt {
-  }
-
-}
-
-package androidx.compose.animation.graphics.vector.compat {
-
-  public final class XmlAnimatedVectorParser_androidKt {
-  }
-
-  public final class XmlAnimatorParser_androidKt {
-  }
-
-  public final class XmlPullParserUtils_androidKt {
-  }
-
 }
 
diff --git a/compose/animation/animation-graphics/api/public_plus_experimental_1.4.0-beta01.txt b/compose/animation/animation-graphics/api/public_plus_experimental_1.4.0-beta01.txt
index 08a1623..cf4d086 100644
--- a/compose/animation/animation-graphics/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/animation/animation-graphics/api/public_plus_experimental_1.4.0-beta01.txt
@@ -16,9 +16,6 @@
     method @androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi @androidx.compose.runtime.Composable public static androidx.compose.animation.graphics.vector.AnimatedImageVector animatedVectorResource(androidx.compose.animation.graphics.vector.AnimatedImageVector.Companion, @DrawableRes int id);
   }
 
-  public final class AnimatorResources_androidKt {
-  }
-
 }
 
 package androidx.compose.animation.graphics.vector {
@@ -34,24 +31,5 @@
   public static final class AnimatedImageVector.Companion {
   }
 
-  public final class AnimatorAnimationSpecsKt {
-  }
-
-  public final class AnimatorKt {
-  }
-
-}
-
-package androidx.compose.animation.graphics.vector.compat {
-
-  public final class XmlAnimatedVectorParser_androidKt {
-  }
-
-  public final class XmlAnimatorParser_androidKt {
-  }
-
-  public final class XmlPullParserUtils_androidKt {
-  }
-
 }
 
diff --git a/compose/animation/animation-graphics/api/public_plus_experimental_current.txt b/compose/animation/animation-graphics/api/public_plus_experimental_current.txt
index 08a1623..cf4d086 100644
--- a/compose/animation/animation-graphics/api/public_plus_experimental_current.txt
+++ b/compose/animation/animation-graphics/api/public_plus_experimental_current.txt
@@ -16,9 +16,6 @@
     method @androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi @androidx.compose.runtime.Composable public static androidx.compose.animation.graphics.vector.AnimatedImageVector animatedVectorResource(androidx.compose.animation.graphics.vector.AnimatedImageVector.Companion, @DrawableRes int id);
   }
 
-  public final class AnimatorResources_androidKt {
-  }
-
 }
 
 package androidx.compose.animation.graphics.vector {
@@ -34,24 +31,5 @@
   public static final class AnimatedImageVector.Companion {
   }
 
-  public final class AnimatorAnimationSpecsKt {
-  }
-
-  public final class AnimatorKt {
-  }
-
-}
-
-package androidx.compose.animation.graphics.vector.compat {
-
-  public final class XmlAnimatedVectorParser_androidKt {
-  }
-
-  public final class XmlAnimatorParser_androidKt {
-  }
-
-  public final class XmlPullParserUtils_androidKt {
-  }
-
 }
 
diff --git a/compose/animation/animation-graphics/api/restricted_1.4.0-beta01.txt b/compose/animation/animation-graphics/api/restricted_1.4.0-beta01.txt
index 9c4ad0e..22d9fe9 100644
--- a/compose/animation/animation-graphics/api/restricted_1.4.0-beta01.txt
+++ b/compose/animation/animation-graphics/api/restricted_1.4.0-beta01.txt
@@ -7,31 +7,5 @@
   public final class AnimatedVectorResources_androidKt {
   }
 
-  public final class AnimatorResources_androidKt {
-  }
-
-}
-
-package androidx.compose.animation.graphics.vector {
-
-  public final class AnimatorAnimationSpecsKt {
-  }
-
-  public final class AnimatorKt {
-  }
-
-}
-
-package androidx.compose.animation.graphics.vector.compat {
-
-  public final class XmlAnimatedVectorParser_androidKt {
-  }
-
-  public final class XmlAnimatorParser_androidKt {
-  }
-
-  public final class XmlPullParserUtils_androidKt {
-  }
-
 }
 
diff --git a/compose/animation/animation-graphics/api/restricted_current.ignore b/compose/animation/animation-graphics/api/restricted_current.ignore
new file mode 100644
index 0000000..aa10076
--- /dev/null
+++ b/compose/animation/animation-graphics/api/restricted_current.ignore
@@ -0,0 +1,9 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.animation.graphics.res.AnimatorResources_androidKt:
+    Removed class androidx.compose.animation.graphics.res.AnimatorResources_androidKt
+
+
+RemovedPackage: androidx.compose.animation.graphics.vector:
+    Removed package androidx.compose.animation.graphics.vector
+RemovedPackage: androidx.compose.animation.graphics.vector.compat:
+    Removed package androidx.compose.animation.graphics.vector.compat
diff --git a/compose/animation/animation-graphics/api/restricted_current.txt b/compose/animation/animation-graphics/api/restricted_current.txt
index 9c4ad0e..22d9fe9 100644
--- a/compose/animation/animation-graphics/api/restricted_current.txt
+++ b/compose/animation/animation-graphics/api/restricted_current.txt
@@ -7,31 +7,5 @@
   public final class AnimatedVectorResources_androidKt {
   }
 
-  public final class AnimatorResources_androidKt {
-  }
-
-}
-
-package androidx.compose.animation.graphics.vector {
-
-  public final class AnimatorAnimationSpecsKt {
-  }
-
-  public final class AnimatorKt {
-  }
-
-}
-
-package androidx.compose.animation.graphics.vector.compat {
-
-  public final class XmlAnimatedVectorParser_androidKt {
-  }
-
-  public final class XmlAnimatorParser_androidKt {
-  }
-
-  public final class XmlPullParserUtils_androidKt {
-  }
-
 }
 
diff --git a/compose/animation/animation/api/1.4.0-beta01.txt b/compose/animation/animation/api/1.4.0-beta01.txt
index 9a6e17a..6b3a0d0 100644
--- a/compose/animation/animation/api/1.4.0-beta01.txt
+++ b/compose/animation/animation/api/1.4.0-beta01.txt
@@ -70,9 +70,6 @@
     property public final androidx.compose.animation.ExitTransition None;
   }
 
-  public final class FlingCalculatorKt {
-  }
-
   public final class SingleValueAnimationKt {
     method public static androidx.compose.animation.core.Animatable<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D> Animatable(long initialValue);
     method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColorAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.graphics.Color> animationSpec, optional String label, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Color,kotlin.Unit>? finishedListener);
@@ -106,10 +103,3 @@
 
 }
 
-package androidx.compose.animation.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/animation/animation/api/current.ignore b/compose/animation/animation/api/current.ignore
index 0b4033d..2b0509b 100644
--- a/compose/animation/animation/api/current.ignore
+++ b/compose/animation/animation/api/current.ignore
@@ -1,3 +1,11 @@
 // Baseline format: 1.0
 ChangedType: androidx.compose.animation.TransitionKt#animateColor(androidx.compose.animation.core.InfiniteTransition, long, long, androidx.compose.animation.core.InfiniteRepeatableSpec<androidx.compose.ui.graphics.Color>):
     Method androidx.compose.animation.TransitionKt.animateColor has changed return type from androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> to androidx.compose.runtime.State<? extends androidx.compose.ui.graphics.Color>
+
+
+RemovedClass: androidx.compose.animation.FlingCalculatorKt:
+    Removed class androidx.compose.animation.FlingCalculatorKt
+
+
+RemovedPackage: androidx.compose.animation.internal:
+    Removed package androidx.compose.animation.internal
diff --git a/compose/animation/animation/api/current.txt b/compose/animation/animation/api/current.txt
index 9a6e17a..6b3a0d0 100644
--- a/compose/animation/animation/api/current.txt
+++ b/compose/animation/animation/api/current.txt
@@ -70,9 +70,6 @@
     property public final androidx.compose.animation.ExitTransition None;
   }
 
-  public final class FlingCalculatorKt {
-  }
-
   public final class SingleValueAnimationKt {
     method public static androidx.compose.animation.core.Animatable<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D> Animatable(long initialValue);
     method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColorAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.graphics.Color> animationSpec, optional String label, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Color,kotlin.Unit>? finishedListener);
@@ -106,10 +103,3 @@
 
 }
 
-package androidx.compose.animation.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/animation/animation/api/public_plus_experimental_1.4.0-beta01.txt b/compose/animation/animation/api/public_plus_experimental_1.4.0-beta01.txt
index b34adcc..4e9addc 100644
--- a/compose/animation/animation/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/animation/animation/api/public_plus_experimental_1.4.0-beta01.txt
@@ -136,9 +136,6 @@
   @kotlin.RequiresOptIn(message="This is an experimental animation API.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ExperimentalAnimationApi {
   }
 
-  public final class FlingCalculatorKt {
-  }
-
   public final class SingleValueAnimationKt {
     method public static androidx.compose.animation.core.Animatable<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D> Animatable(long initialValue);
     method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColorAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.graphics.Color> animationSpec, optional String label, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Color,kotlin.Unit>? finishedListener);
@@ -178,10 +175,3 @@
 
 }
 
-package androidx.compose.animation.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/animation/animation/api/public_plus_experimental_current.txt b/compose/animation/animation/api/public_plus_experimental_current.txt
index b34adcc..4e9addc 100644
--- a/compose/animation/animation/api/public_plus_experimental_current.txt
+++ b/compose/animation/animation/api/public_plus_experimental_current.txt
@@ -136,9 +136,6 @@
   @kotlin.RequiresOptIn(message="This is an experimental animation API.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ExperimentalAnimationApi {
   }
 
-  public final class FlingCalculatorKt {
-  }
-
   public final class SingleValueAnimationKt {
     method public static androidx.compose.animation.core.Animatable<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D> Animatable(long initialValue);
     method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColorAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.graphics.Color> animationSpec, optional String label, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Color,kotlin.Unit>? finishedListener);
@@ -178,10 +175,3 @@
 
 }
 
-package androidx.compose.animation.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/animation/animation/api/restricted_1.4.0-beta01.txt b/compose/animation/animation/api/restricted_1.4.0-beta01.txt
index 9a6e17a..6b3a0d0 100644
--- a/compose/animation/animation/api/restricted_1.4.0-beta01.txt
+++ b/compose/animation/animation/api/restricted_1.4.0-beta01.txt
@@ -70,9 +70,6 @@
     property public final androidx.compose.animation.ExitTransition None;
   }
 
-  public final class FlingCalculatorKt {
-  }
-
   public final class SingleValueAnimationKt {
     method public static androidx.compose.animation.core.Animatable<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D> Animatable(long initialValue);
     method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColorAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.graphics.Color> animationSpec, optional String label, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Color,kotlin.Unit>? finishedListener);
@@ -106,10 +103,3 @@
 
 }
 
-package androidx.compose.animation.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/animation/animation/api/restricted_current.ignore b/compose/animation/animation/api/restricted_current.ignore
index 0b4033d..2b0509b 100644
--- a/compose/animation/animation/api/restricted_current.ignore
+++ b/compose/animation/animation/api/restricted_current.ignore
@@ -1,3 +1,11 @@
 // Baseline format: 1.0
 ChangedType: androidx.compose.animation.TransitionKt#animateColor(androidx.compose.animation.core.InfiniteTransition, long, long, androidx.compose.animation.core.InfiniteRepeatableSpec<androidx.compose.ui.graphics.Color>):
     Method androidx.compose.animation.TransitionKt.animateColor has changed return type from androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> to androidx.compose.runtime.State<? extends androidx.compose.ui.graphics.Color>
+
+
+RemovedClass: androidx.compose.animation.FlingCalculatorKt:
+    Removed class androidx.compose.animation.FlingCalculatorKt
+
+
+RemovedPackage: androidx.compose.animation.internal:
+    Removed package androidx.compose.animation.internal
diff --git a/compose/animation/animation/api/restricted_current.txt b/compose/animation/animation/api/restricted_current.txt
index 9a6e17a..6b3a0d0 100644
--- a/compose/animation/animation/api/restricted_current.txt
+++ b/compose/animation/animation/api/restricted_current.txt
@@ -70,9 +70,6 @@
     property public final androidx.compose.animation.ExitTransition None;
   }
 
-  public final class FlingCalculatorKt {
-  }
-
   public final class SingleValueAnimationKt {
     method public static androidx.compose.animation.core.Animatable<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D> Animatable(long initialValue);
     method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColorAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.graphics.Color> animationSpec, optional String label, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Color,kotlin.Unit>? finishedListener);
@@ -106,10 +103,3 @@
 
 }
 
-package androidx.compose.animation.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/foundation/foundation-layout/api/1.4.0-beta01.txt b/compose/foundation/foundation-layout/api/1.4.0-beta01.txt
index 98b9343..f9ca366c 100644
--- a/compose/foundation/foundation-layout/api/1.4.0-beta01.txt
+++ b/compose/foundation/foundation-layout/api/1.4.0-beta01.txt
@@ -166,9 +166,6 @@
     method public float calculateTopPadding();
   }
 
-  public final class RowColumnImplKt {
-  }
-
   public final class RowKt {
     method @androidx.compose.runtime.Composable public static inline void Row(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
   }
@@ -308,10 +305,3 @@
 
 }
 
-package androidx.compose.foundation.layout.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/foundation/foundation-layout/api/current.ignore b/compose/foundation/foundation-layout/api/current.ignore
new file mode 100644
index 0000000..5539ed4
--- /dev/null
+++ b/compose/foundation/foundation-layout/api/current.ignore
@@ -0,0 +1,7 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.foundation.layout.RowColumnImplKt:
+    Removed class androidx.compose.foundation.layout.RowColumnImplKt
+
+
+RemovedPackage: androidx.compose.foundation.layout.internal:
+    Removed package androidx.compose.foundation.layout.internal
diff --git a/compose/foundation/foundation-layout/api/current.txt b/compose/foundation/foundation-layout/api/current.txt
index 98b9343..f9ca366c 100644
--- a/compose/foundation/foundation-layout/api/current.txt
+++ b/compose/foundation/foundation-layout/api/current.txt
@@ -166,9 +166,6 @@
     method public float calculateTopPadding();
   }
 
-  public final class RowColumnImplKt {
-  }
-
   public final class RowKt {
     method @androidx.compose.runtime.Composable public static inline void Row(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
   }
@@ -308,10 +305,3 @@
 
 }
 
-package androidx.compose.foundation.layout.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/foundation/foundation-layout/api/public_plus_experimental_1.4.0-beta01.txt b/compose/foundation/foundation-layout/api/public_plus_experimental_1.4.0-beta01.txt
index 05b6344..d99d5f0 100644
--- a/compose/foundation/foundation-layout/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/foundation/foundation-layout/api/public_plus_experimental_1.4.0-beta01.txt
@@ -182,9 +182,6 @@
     method public float calculateTopPadding();
   }
 
-  public final class RowColumnImplKt {
-  }
-
   public final class RowKt {
     method @androidx.compose.runtime.Composable public static inline void Row(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
   }
@@ -342,10 +339,3 @@
 
 }
 
-package androidx.compose.foundation.layout.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/foundation/foundation-layout/api/public_plus_experimental_current.txt b/compose/foundation/foundation-layout/api/public_plus_experimental_current.txt
index 05b6344..d99d5f0 100644
--- a/compose/foundation/foundation-layout/api/public_plus_experimental_current.txt
+++ b/compose/foundation/foundation-layout/api/public_plus_experimental_current.txt
@@ -182,9 +182,6 @@
     method public float calculateTopPadding();
   }
 
-  public final class RowColumnImplKt {
-  }
-
   public final class RowKt {
     method @androidx.compose.runtime.Composable public static inline void Row(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
   }
@@ -342,10 +339,3 @@
 
 }
 
-package androidx.compose.foundation.layout.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/foundation/foundation-layout/api/restricted_1.4.0-beta01.txt b/compose/foundation/foundation-layout/api/restricted_1.4.0-beta01.txt
index f1576ee..bdbef98 100644
--- a/compose/foundation/foundation-layout/api/restricted_1.4.0-beta01.txt
+++ b/compose/foundation/foundation-layout/api/restricted_1.4.0-beta01.txt
@@ -169,9 +169,6 @@
     method public float calculateTopPadding();
   }
 
-  public final class RowColumnImplKt {
-  }
-
   public final class RowKt {
     method @androidx.compose.runtime.Composable public static inline void Row(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
     method @androidx.compose.runtime.Composable @kotlin.PublishedApi internal static androidx.compose.ui.layout.MeasurePolicy rowMeasurePolicy(androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, androidx.compose.ui.Alignment.Vertical verticalAlignment);
@@ -313,10 +310,3 @@
 
 }
 
-package androidx.compose.foundation.layout.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/foundation/foundation-layout/api/restricted_current.ignore b/compose/foundation/foundation-layout/api/restricted_current.ignore
new file mode 100644
index 0000000..5539ed4
--- /dev/null
+++ b/compose/foundation/foundation-layout/api/restricted_current.ignore
@@ -0,0 +1,7 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.foundation.layout.RowColumnImplKt:
+    Removed class androidx.compose.foundation.layout.RowColumnImplKt
+
+
+RemovedPackage: androidx.compose.foundation.layout.internal:
+    Removed package androidx.compose.foundation.layout.internal
diff --git a/compose/foundation/foundation-layout/api/restricted_current.txt b/compose/foundation/foundation-layout/api/restricted_current.txt
index f1576ee..bdbef98 100644
--- a/compose/foundation/foundation-layout/api/restricted_current.txt
+++ b/compose/foundation/foundation-layout/api/restricted_current.txt
@@ -169,9 +169,6 @@
     method public float calculateTopPadding();
   }
 
-  public final class RowColumnImplKt {
-  }
-
   public final class RowKt {
     method @androidx.compose.runtime.Composable public static inline void Row(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
     method @androidx.compose.runtime.Composable @kotlin.PublishedApi internal static androidx.compose.ui.layout.MeasurePolicy rowMeasurePolicy(androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, androidx.compose.ui.Alignment.Vertical verticalAlignment);
@@ -313,10 +310,3 @@
 
 }
 
-package androidx.compose.foundation.layout.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/foundation/foundation/api/1.4.0-beta01.txt b/compose/foundation/foundation/api/1.4.0-beta01.txt
index 1c8281c..4ea5f3c 100644
--- a/compose/foundation/foundation/api/1.4.0-beta01.txt
+++ b/compose/foundation/foundation/api/1.4.0-beta01.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.foundation {
 
-  public final class ActualJvmKt {
-  }
-
-  public final class AndroidOverscrollKt {
-  }
-
   public final class BackgroundKt {
     method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, long color, optional androidx.compose.ui.graphics.Shape shape);
     method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shape shape, optional float alpha);
@@ -47,9 +41,6 @@
     method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
   }
 
-  public final class Clickable_androidKt {
-  }
-
   public final class ClipScrollableContainerKt {
     method public static androidx.compose.ui.Modifier clipScrollableContainer(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.Orientation orientation);
   }
@@ -58,9 +49,6 @@
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean isSystemInDarkTheme();
   }
 
-  public final class DarkTheme_androidKt {
-  }
-
   public final class ExcludeFromSystemGesture_androidKt {
     method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier);
     method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
@@ -161,19 +149,10 @@
     method public static androidx.compose.ui.Modifier systemGestureExclusion(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
   }
 
-  public final class TempListUtilsKt {
-  }
-
 }
 
 package androidx.compose.foundation.gestures {
 
-  public final class AndroidScrollable_androidKt {
-  }
-
-  public final class ContentInViewModifierKt {
-  }
-
   public final class DragGestureDetectorKt {
     method public static suspend Object? awaitDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
     method public static suspend Object? awaitHorizontalDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
@@ -425,18 +404,8 @@
 
 }
 
-package androidx.compose.foundation.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.foundation.lazy {
 
-  public final class LazyBeyondBoundsModifierKt {
-  }
-
   public final class LazyDslKt {
     method @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,? extends kotlin.Unit> content);
@@ -458,9 +427,6 @@
     method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
   }
 
-  public final class LazyListHeadersKt {
-  }
-
   public interface LazyListItemInfo {
     method public int getIndex();
     method public Object getKey();
@@ -472,15 +438,6 @@
     property public abstract int size;
   }
 
-  public final class LazyListItemPlacementAnimatorKt {
-  }
-
-  public final class LazyListItemProviderKt {
-  }
-
-  public final class LazyListKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyListLayoutInfo {
     method public default int getAfterContentPadding();
     method public default int getBeforeContentPadding();
@@ -504,9 +461,6 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyListMeasureKt {
-  }
-
   @androidx.compose.foundation.lazy.LazyScopeMarker @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyListScope {
     method public default void item(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
     method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,? extends kotlin.Unit> content);
@@ -547,9 +501,6 @@
   @kotlin.DslMarker public @interface LazyScopeMarker {
   }
 
-  public final class LazySemanticsKt {
-  }
-
 }
 
 package androidx.compose.foundation.lazy.grid {
@@ -604,12 +555,6 @@
     field public static final int UnknownRow = -1; // 0xffffffff
   }
 
-  public final class LazyGridItemPlacementAnimatorKt {
-  }
-
-  public final class LazyGridItemProviderKt {
-  }
-
   @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker @androidx.compose.runtime.Stable public sealed interface LazyGridItemScope {
   }
 
@@ -620,9 +565,6 @@
     property public abstract int maxLineSpan;
   }
 
-  public final class LazyGridKt {
-  }
-
   public sealed interface LazyGridLayoutInfo {
     method public int getAfterContentPadding();
     method public int getBeforeContentPadding();
@@ -646,9 +588,6 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.grid.LazyGridItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyGridMeasureKt {
-  }
-
   @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridScope {
     method public void item(optional Object? key, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,kotlin.Unit> content);
     method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
@@ -691,19 +630,10 @@
     method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.grid.LazyGridState rememberLazyGridState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
   }
 
-  public final class LazySemanticsKt {
-  }
-
 }
 
 package androidx.compose.foundation.lazy.layout {
 
-  public final class IntervalListKt {
-  }
-
-  public final class LazyAnimateScrollKt {
-  }
-
   public final class LazyLayoutItemProviderKt {
   }
 
@@ -713,18 +643,9 @@
   public final class LazyLayoutPinnableItemKt {
   }
 
-  public final class LazyLayoutPrefetcher_androidKt {
-  }
-
-  public final class LazyLayoutSemanticsKt {
-  }
-
   public final class LazyNearestItemsRangeKt {
   }
 
-  public final class LazySaveableStateHolderKt {
-  }
-
   public final class Lazy_androidKt {
   }
 
@@ -732,30 +653,9 @@
 
 package androidx.compose.foundation.lazy.staggeredgrid {
 
-  public final class LazyStaggeredGridCellsKt {
-  }
-
   public final class LazyStaggeredGridDslKt {
   }
 
-  public final class LazyStaggeredGridItemProviderKt {
-  }
-
-  public final class LazyStaggeredGridKt {
-  }
-
-  public final class LazyStaggeredGridMeasureKt {
-  }
-
-  public final class LazyStaggeredGridMeasurePolicyKt {
-  }
-
-  public final class LazyStaggeredGridMeasureResultKt {
-  }
-
-  public final class LazyStaggeredGridSemanticsKt {
-  }
-
   public final class LazyStaggeredGridStateKt {
   }
 
@@ -773,18 +673,12 @@
 
 package androidx.compose.foundation.relocation {
 
-  public final class BringIntoViewKt {
-  }
-
   public final class BringIntoViewRequesterKt {
   }
 
   public final class BringIntoViewResponderKt {
   }
 
-  public final class BringIntoViewResponder_androidKt {
-  }
-
 }
 
 package androidx.compose.foundation.selection {
@@ -912,9 +806,6 @@
 
 package androidx.compose.foundation.text {
 
-  public final class AndroidCursorHandle_androidKt {
-  }
-
   public final class BasicTextFieldKt {
     method @androidx.compose.runtime.Composable public static void BasicTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
     method @androidx.compose.runtime.Composable public static void BasicTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
@@ -933,18 +824,6 @@
     method @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional int overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
   }
 
-  public final class ContextMenu_androidKt {
-  }
-
-  public final class CoreTextFieldKt {
-  }
-
-  public final class CoreTextKt {
-  }
-
-  public final class HeightInLinesModifierKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class InlineTextContent {
     ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
     method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
@@ -957,15 +836,6 @@
     method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, optional String alternateText);
   }
 
-  public final class KeyEventHelpers_androidKt {
-  }
-
-  public final class KeyMappingKt {
-  }
-
-  public final class KeyMapping_androidKt {
-  }
-
   public interface KeyboardActionScope {
     method public void defaultKeyboardAction(int imeAction);
   }
@@ -1015,117 +885,15 @@
     property public final androidx.compose.foundation.text.KeyboardOptions Default;
   }
 
-  public final class LongPressTextDragObserverKt {
-  }
-
-  public final class PointerMoveDetectorKt {
-  }
-
-  public final class StringHelpersKt {
-  }
-
-  public final class StringHelpers_androidKt {
-  }
-
-  public final class StringHelpers_jvmKt {
-  }
-
-  public final class TextDelegateKt {
-  }
-
-  public final class TextFieldCursorKt {
-  }
-
-  public final class TextFieldDelegateKt {
-  }
-
-  public final class TextFieldFocusModifier_androidKt {
-  }
-
-  public final class TextFieldGestureModifiersKt {
-  }
-
-  public final class TextFieldKeyInputKt {
-  }
-
-  public final class TextFieldKeyInput_androidKt {
-  }
-
-  public final class TextFieldPressGestureFilterKt {
-  }
-
-  public final class TextFieldScrollKt {
-  }
-
-  public final class TextFieldSizeKt {
-  }
-
-  public final class TextLayoutHelperKt {
-  }
-
-  public final class TextLayoutResultProxyKt {
-  }
-
-  public final class TextPointerIcon_androidKt {
-  }
-
-  public final class TouchMode_androidKt {
-  }
-
-  public final class UndoManagerKt {
-  }
-
-  public final class UndoManager_jvmKt {
-  }
-
-  public final class ValidatingOffsetMappingKt {
-  }
-
 }
 
 package androidx.compose.foundation.text.selection {
 
-  public final class AndroidSelectionHandles_androidKt {
-  }
-
-  public final class MultiWidgetSelectionDelegateKt {
-  }
-
-  public final class SelectionAdjustmentKt {
-  }
-
   public final class SelectionContainerKt {
     method @androidx.compose.runtime.Composable public static void DisableSelection(kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void SelectionContainer(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class SelectionHandlesKt {
-  }
-
-  public final class SelectionMagnifierKt {
-  }
-
-  public final class SelectionManagerKt {
-  }
-
-  public final class SelectionManager_androidKt {
-  }
-
-  public final class SelectionRegistrarKt {
-  }
-
-  public final class SimpleLayoutKt {
-  }
-
-  public final class TextFieldSelectionDelegateKt {
-  }
-
-  public final class TextFieldSelectionManagerKt {
-  }
-
-  public final class TextFieldSelectionManager_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class TextSelectionColors {
     ctor public TextSelectionColors(long handleColor, long backgroundColor);
     method public long getBackgroundColor();
@@ -1139,11 +907,5 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> LocalTextSelectionColors;
   }
 
-  public final class TextSelectionDelegateKt {
-  }
-
-  public final class TextSelectionMouseDetectorKt {
-  }
-
 }
 
diff --git a/compose/foundation/foundation/api/current.ignore b/compose/foundation/foundation/api/current.ignore
index d1a4e31..414998d 100644
--- a/compose/foundation/foundation/api/current.ignore
+++ b/compose/foundation/foundation/api/current.ignore
@@ -3,15 +3,165 @@
     Added method androidx.compose.foundation.lazy.grid.LazyGridLayoutInfo.getMainAxisItemSpacing()
 
 
+RemovedClass: androidx.compose.foundation.ActualJvmKt:
+    Removed class androidx.compose.foundation.ActualJvmKt
+RemovedClass: androidx.compose.foundation.AndroidOverscrollKt:
+    Removed class androidx.compose.foundation.AndroidOverscrollKt
+RemovedClass: androidx.compose.foundation.Clickable_androidKt:
+    Removed class androidx.compose.foundation.Clickable_androidKt
+RemovedClass: androidx.compose.foundation.DarkTheme_androidKt:
+    Removed class androidx.compose.foundation.DarkTheme_androidKt
+RemovedClass: androidx.compose.foundation.TempListUtilsKt:
+    Removed class androidx.compose.foundation.TempListUtilsKt
+RemovedClass: androidx.compose.foundation.gestures.AndroidScrollable_androidKt:
+    Removed class androidx.compose.foundation.gestures.AndroidScrollable_androidKt
+RemovedClass: androidx.compose.foundation.lazy.LazyBeyondBoundsModifierKt:
+    Removed class androidx.compose.foundation.lazy.LazyBeyondBoundsModifierKt
+RemovedClass: androidx.compose.foundation.lazy.LazyListHeadersKt:
+    Removed class androidx.compose.foundation.lazy.LazyListHeadersKt
+RemovedClass: androidx.compose.foundation.lazy.LazyListItemPlacementAnimatorKt:
+    Removed class androidx.compose.foundation.lazy.LazyListItemPlacementAnimatorKt
+RemovedClass: androidx.compose.foundation.lazy.LazyListItemProviderKt:
+    Removed class androidx.compose.foundation.lazy.LazyListItemProviderKt
+RemovedClass: androidx.compose.foundation.lazy.LazyListKt:
+    Removed class androidx.compose.foundation.lazy.LazyListKt
+RemovedClass: androidx.compose.foundation.lazy.LazyListMeasureKt:
+    Removed class androidx.compose.foundation.lazy.LazyListMeasureKt
 RemovedClass: androidx.compose.foundation.lazy.LazyListPinningModifierKt:
     Removed class androidx.compose.foundation.lazy.LazyListPinningModifierKt
+RemovedClass: androidx.compose.foundation.lazy.LazySemanticsKt:
+    Removed class androidx.compose.foundation.lazy.LazySemanticsKt
+RemovedClass: androidx.compose.foundation.lazy.grid.LazyGridItemPlacementAnimatorKt:
+    Removed class androidx.compose.foundation.lazy.grid.LazyGridItemPlacementAnimatorKt
+RemovedClass: androidx.compose.foundation.lazy.grid.LazyGridItemProviderKt:
+    Removed class androidx.compose.foundation.lazy.grid.LazyGridItemProviderKt
+RemovedClass: androidx.compose.foundation.lazy.grid.LazyGridKt:
+    Removed class androidx.compose.foundation.lazy.grid.LazyGridKt
+RemovedClass: androidx.compose.foundation.lazy.grid.LazyGridMeasureKt:
+    Removed class androidx.compose.foundation.lazy.grid.LazyGridMeasureKt
+RemovedClass: androidx.compose.foundation.lazy.grid.LazySemanticsKt:
+    Removed class androidx.compose.foundation.lazy.grid.LazySemanticsKt
+RemovedClass: androidx.compose.foundation.lazy.layout.IntervalListKt:
+    Removed class androidx.compose.foundation.lazy.layout.IntervalListKt
+RemovedClass: androidx.compose.foundation.lazy.layout.LazyAnimateScrollKt:
+    Removed class androidx.compose.foundation.lazy.layout.LazyAnimateScrollKt
+RemovedClass: androidx.compose.foundation.lazy.layout.LazyLayoutPrefetcher_androidKt:
+    Removed class androidx.compose.foundation.lazy.layout.LazyLayoutPrefetcher_androidKt
+RemovedClass: androidx.compose.foundation.lazy.layout.LazyLayoutSemanticsKt:
+    Removed class androidx.compose.foundation.lazy.layout.LazyLayoutSemanticsKt
+RemovedClass: androidx.compose.foundation.lazy.layout.LazySaveableStateHolderKt:
+    Removed class androidx.compose.foundation.lazy.layout.LazySaveableStateHolderKt
 RemovedClass: androidx.compose.foundation.lazy.layout.PinnableParentKt:
     Removed class androidx.compose.foundation.lazy.layout.PinnableParentKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridCellsKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridCellsKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemProviderKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemProviderKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridMeasureKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridMeasureKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridMeasurePolicyKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridMeasurePolicyKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridMeasureResultKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridMeasureResultKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridSemanticsKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridSemanticsKt
+RemovedClass: androidx.compose.foundation.relocation.BringIntoViewKt:
+    Removed class androidx.compose.foundation.relocation.BringIntoViewKt
+RemovedClass: androidx.compose.foundation.relocation.BringIntoViewResponder_androidKt:
+    Removed class androidx.compose.foundation.relocation.BringIntoViewResponder_androidKt
+RemovedClass: androidx.compose.foundation.text.AndroidCursorHandle_androidKt:
+    Removed class androidx.compose.foundation.text.AndroidCursorHandle_androidKt
+RemovedClass: androidx.compose.foundation.text.ContextMenu_androidKt:
+    Removed class androidx.compose.foundation.text.ContextMenu_androidKt
+RemovedClass: androidx.compose.foundation.text.CoreTextFieldKt:
+    Removed class androidx.compose.foundation.text.CoreTextFieldKt
+RemovedClass: androidx.compose.foundation.text.CoreTextKt:
+    Removed class androidx.compose.foundation.text.CoreTextKt
+RemovedClass: androidx.compose.foundation.text.KeyEventHelpers_androidKt:
+    Removed class androidx.compose.foundation.text.KeyEventHelpers_androidKt
+RemovedClass: androidx.compose.foundation.text.KeyMappingKt:
+    Removed class androidx.compose.foundation.text.KeyMappingKt
+RemovedClass: androidx.compose.foundation.text.KeyMapping_androidKt:
+    Removed class androidx.compose.foundation.text.KeyMapping_androidKt
+RemovedClass: androidx.compose.foundation.text.LongPressTextDragObserverKt:
+    Removed class androidx.compose.foundation.text.LongPressTextDragObserverKt
 RemovedClass: androidx.compose.foundation.text.MaxLinesHeightModifierKt:
     Removed class androidx.compose.foundation.text.MaxLinesHeightModifierKt
+RemovedClass: androidx.compose.foundation.text.StringHelpersKt:
+    Removed class androidx.compose.foundation.text.StringHelpersKt
+RemovedClass: androidx.compose.foundation.text.StringHelpers_androidKt:
+    Removed class androidx.compose.foundation.text.StringHelpers_androidKt
+RemovedClass: androidx.compose.foundation.text.StringHelpers_jvmKt:
+    Removed class androidx.compose.foundation.text.StringHelpers_jvmKt
+RemovedClass: androidx.compose.foundation.text.TextDelegateKt:
+    Removed class androidx.compose.foundation.text.TextDelegateKt
+RemovedClass: androidx.compose.foundation.text.TextFieldCursorKt:
+    Removed class androidx.compose.foundation.text.TextFieldCursorKt
+RemovedClass: androidx.compose.foundation.text.TextFieldDelegateKt:
+    Removed class androidx.compose.foundation.text.TextFieldDelegateKt
+RemovedClass: androidx.compose.foundation.text.TextFieldGestureModifiersKt:
+    Removed class androidx.compose.foundation.text.TextFieldGestureModifiersKt
+RemovedClass: androidx.compose.foundation.text.TextFieldKeyInputKt:
+    Removed class androidx.compose.foundation.text.TextFieldKeyInputKt
+RemovedClass: androidx.compose.foundation.text.TextFieldKeyInput_androidKt:
+    Removed class androidx.compose.foundation.text.TextFieldKeyInput_androidKt
+RemovedClass: androidx.compose.foundation.text.TextFieldPressGestureFilterKt:
+    Removed class androidx.compose.foundation.text.TextFieldPressGestureFilterKt
+RemovedClass: androidx.compose.foundation.text.TextFieldScrollKt:
+    Removed class androidx.compose.foundation.text.TextFieldScrollKt
+RemovedClass: androidx.compose.foundation.text.TextFieldSizeKt:
+    Removed class androidx.compose.foundation.text.TextFieldSizeKt
+RemovedClass: androidx.compose.foundation.text.TextLayoutHelperKt:
+    Removed class androidx.compose.foundation.text.TextLayoutHelperKt
+RemovedClass: androidx.compose.foundation.text.TextLayoutResultProxyKt:
+    Removed class androidx.compose.foundation.text.TextLayoutResultProxyKt
+RemovedClass: androidx.compose.foundation.text.TextPointerIcon_androidKt:
+    Removed class androidx.compose.foundation.text.TextPointerIcon_androidKt
+RemovedClass: androidx.compose.foundation.text.TouchMode_androidKt:
+    Removed class androidx.compose.foundation.text.TouchMode_androidKt
+RemovedClass: androidx.compose.foundation.text.UndoManagerKt:
+    Removed class androidx.compose.foundation.text.UndoManagerKt
+RemovedClass: androidx.compose.foundation.text.UndoManager_jvmKt:
+    Removed class androidx.compose.foundation.text.UndoManager_jvmKt
+RemovedClass: androidx.compose.foundation.text.ValidatingOffsetMappingKt:
+    Removed class androidx.compose.foundation.text.ValidatingOffsetMappingKt
+RemovedClass: androidx.compose.foundation.text.selection.AndroidSelectionHandles_androidKt:
+    Removed class androidx.compose.foundation.text.selection.AndroidSelectionHandles_androidKt
+RemovedClass: androidx.compose.foundation.text.selection.MultiWidgetSelectionDelegateKt:
+    Removed class androidx.compose.foundation.text.selection.MultiWidgetSelectionDelegateKt
+RemovedClass: androidx.compose.foundation.text.selection.SelectionAdjustmentKt:
+    Removed class androidx.compose.foundation.text.selection.SelectionAdjustmentKt
+RemovedClass: androidx.compose.foundation.text.selection.SelectionHandlesKt:
+    Removed class androidx.compose.foundation.text.selection.SelectionHandlesKt
+RemovedClass: androidx.compose.foundation.text.selection.SelectionMagnifierKt:
+    Removed class androidx.compose.foundation.text.selection.SelectionMagnifierKt
+RemovedClass: androidx.compose.foundation.text.selection.SelectionManagerKt:
+    Removed class androidx.compose.foundation.text.selection.SelectionManagerKt
+RemovedClass: androidx.compose.foundation.text.selection.SelectionManager_androidKt:
+    Removed class androidx.compose.foundation.text.selection.SelectionManager_androidKt
+RemovedClass: androidx.compose.foundation.text.selection.SelectionRegistrarKt:
+    Removed class androidx.compose.foundation.text.selection.SelectionRegistrarKt
+RemovedClass: androidx.compose.foundation.text.selection.SimpleLayoutKt:
+    Removed class androidx.compose.foundation.text.selection.SimpleLayoutKt
+RemovedClass: androidx.compose.foundation.text.selection.TextFieldSelectionDelegateKt:
+    Removed class androidx.compose.foundation.text.selection.TextFieldSelectionDelegateKt
+RemovedClass: androidx.compose.foundation.text.selection.TextFieldSelectionManagerKt:
+    Removed class androidx.compose.foundation.text.selection.TextFieldSelectionManagerKt
+RemovedClass: androidx.compose.foundation.text.selection.TextFieldSelectionManager_androidKt:
+    Removed class androidx.compose.foundation.text.selection.TextFieldSelectionManager_androidKt
+RemovedClass: androidx.compose.foundation.text.selection.TextSelectionDelegateKt:
+    Removed class androidx.compose.foundation.text.selection.TextSelectionDelegateKt
+RemovedClass: androidx.compose.foundation.text.selection.TextSelectionMouseDetectorKt:
+    Removed class androidx.compose.foundation.text.selection.TextSelectionMouseDetectorKt
 
 
 RemovedMethod: androidx.compose.foundation.gestures.TapGestureDetectorKt#awaitFirstDown(androidx.compose.ui.input.pointer.AwaitPointerEventScope, boolean, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>):
     Removed method androidx.compose.foundation.gestures.TapGestureDetectorKt.awaitFirstDown(androidx.compose.ui.input.pointer.AwaitPointerEventScope,boolean,kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>)
 RemovedMethod: androidx.compose.foundation.gestures.TapGestureDetectorKt#waitForUpOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>):
     Removed method androidx.compose.foundation.gestures.TapGestureDetectorKt.waitForUpOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope,kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>)
+
+
+RemovedPackage: androidx.compose.foundation.internal:
+    Removed package androidx.compose.foundation.internal
diff --git a/compose/foundation/foundation/api/current.txt b/compose/foundation/foundation/api/current.txt
index 1c8281c..4ea5f3c 100644
--- a/compose/foundation/foundation/api/current.txt
+++ b/compose/foundation/foundation/api/current.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.foundation {
 
-  public final class ActualJvmKt {
-  }
-
-  public final class AndroidOverscrollKt {
-  }
-
   public final class BackgroundKt {
     method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, long color, optional androidx.compose.ui.graphics.Shape shape);
     method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shape shape, optional float alpha);
@@ -47,9 +41,6 @@
     method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
   }
 
-  public final class Clickable_androidKt {
-  }
-
   public final class ClipScrollableContainerKt {
     method public static androidx.compose.ui.Modifier clipScrollableContainer(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.Orientation orientation);
   }
@@ -58,9 +49,6 @@
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean isSystemInDarkTheme();
   }
 
-  public final class DarkTheme_androidKt {
-  }
-
   public final class ExcludeFromSystemGesture_androidKt {
     method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier);
     method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
@@ -161,19 +149,10 @@
     method public static androidx.compose.ui.Modifier systemGestureExclusion(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
   }
 
-  public final class TempListUtilsKt {
-  }
-
 }
 
 package androidx.compose.foundation.gestures {
 
-  public final class AndroidScrollable_androidKt {
-  }
-
-  public final class ContentInViewModifierKt {
-  }
-
   public final class DragGestureDetectorKt {
     method public static suspend Object? awaitDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
     method public static suspend Object? awaitHorizontalDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
@@ -425,18 +404,8 @@
 
 }
 
-package androidx.compose.foundation.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.foundation.lazy {
 
-  public final class LazyBeyondBoundsModifierKt {
-  }
-
   public final class LazyDslKt {
     method @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,? extends kotlin.Unit> content);
@@ -458,9 +427,6 @@
     method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
   }
 
-  public final class LazyListHeadersKt {
-  }
-
   public interface LazyListItemInfo {
     method public int getIndex();
     method public Object getKey();
@@ -472,15 +438,6 @@
     property public abstract int size;
   }
 
-  public final class LazyListItemPlacementAnimatorKt {
-  }
-
-  public final class LazyListItemProviderKt {
-  }
-
-  public final class LazyListKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyListLayoutInfo {
     method public default int getAfterContentPadding();
     method public default int getBeforeContentPadding();
@@ -504,9 +461,6 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyListMeasureKt {
-  }
-
   @androidx.compose.foundation.lazy.LazyScopeMarker @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyListScope {
     method public default void item(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
     method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,? extends kotlin.Unit> content);
@@ -547,9 +501,6 @@
   @kotlin.DslMarker public @interface LazyScopeMarker {
   }
 
-  public final class LazySemanticsKt {
-  }
-
 }
 
 package androidx.compose.foundation.lazy.grid {
@@ -604,12 +555,6 @@
     field public static final int UnknownRow = -1; // 0xffffffff
   }
 
-  public final class LazyGridItemPlacementAnimatorKt {
-  }
-
-  public final class LazyGridItemProviderKt {
-  }
-
   @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker @androidx.compose.runtime.Stable public sealed interface LazyGridItemScope {
   }
 
@@ -620,9 +565,6 @@
     property public abstract int maxLineSpan;
   }
 
-  public final class LazyGridKt {
-  }
-
   public sealed interface LazyGridLayoutInfo {
     method public int getAfterContentPadding();
     method public int getBeforeContentPadding();
@@ -646,9 +588,6 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.grid.LazyGridItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyGridMeasureKt {
-  }
-
   @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridScope {
     method public void item(optional Object? key, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,kotlin.Unit> content);
     method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
@@ -691,19 +630,10 @@
     method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.grid.LazyGridState rememberLazyGridState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
   }
 
-  public final class LazySemanticsKt {
-  }
-
 }
 
 package androidx.compose.foundation.lazy.layout {
 
-  public final class IntervalListKt {
-  }
-
-  public final class LazyAnimateScrollKt {
-  }
-
   public final class LazyLayoutItemProviderKt {
   }
 
@@ -713,18 +643,9 @@
   public final class LazyLayoutPinnableItemKt {
   }
 
-  public final class LazyLayoutPrefetcher_androidKt {
-  }
-
-  public final class LazyLayoutSemanticsKt {
-  }
-
   public final class LazyNearestItemsRangeKt {
   }
 
-  public final class LazySaveableStateHolderKt {
-  }
-
   public final class Lazy_androidKt {
   }
 
@@ -732,30 +653,9 @@
 
 package androidx.compose.foundation.lazy.staggeredgrid {
 
-  public final class LazyStaggeredGridCellsKt {
-  }
-
   public final class LazyStaggeredGridDslKt {
   }
 
-  public final class LazyStaggeredGridItemProviderKt {
-  }
-
-  public final class LazyStaggeredGridKt {
-  }
-
-  public final class LazyStaggeredGridMeasureKt {
-  }
-
-  public final class LazyStaggeredGridMeasurePolicyKt {
-  }
-
-  public final class LazyStaggeredGridMeasureResultKt {
-  }
-
-  public final class LazyStaggeredGridSemanticsKt {
-  }
-
   public final class LazyStaggeredGridStateKt {
   }
 
@@ -773,18 +673,12 @@
 
 package androidx.compose.foundation.relocation {
 
-  public final class BringIntoViewKt {
-  }
-
   public final class BringIntoViewRequesterKt {
   }
 
   public final class BringIntoViewResponderKt {
   }
 
-  public final class BringIntoViewResponder_androidKt {
-  }
-
 }
 
 package androidx.compose.foundation.selection {
@@ -912,9 +806,6 @@
 
 package androidx.compose.foundation.text {
 
-  public final class AndroidCursorHandle_androidKt {
-  }
-
   public final class BasicTextFieldKt {
     method @androidx.compose.runtime.Composable public static void BasicTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
     method @androidx.compose.runtime.Composable public static void BasicTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
@@ -933,18 +824,6 @@
     method @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional int overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
   }
 
-  public final class ContextMenu_androidKt {
-  }
-
-  public final class CoreTextFieldKt {
-  }
-
-  public final class CoreTextKt {
-  }
-
-  public final class HeightInLinesModifierKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class InlineTextContent {
     ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
     method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
@@ -957,15 +836,6 @@
     method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, optional String alternateText);
   }
 
-  public final class KeyEventHelpers_androidKt {
-  }
-
-  public final class KeyMappingKt {
-  }
-
-  public final class KeyMapping_androidKt {
-  }
-
   public interface KeyboardActionScope {
     method public void defaultKeyboardAction(int imeAction);
   }
@@ -1015,117 +885,15 @@
     property public final androidx.compose.foundation.text.KeyboardOptions Default;
   }
 
-  public final class LongPressTextDragObserverKt {
-  }
-
-  public final class PointerMoveDetectorKt {
-  }
-
-  public final class StringHelpersKt {
-  }
-
-  public final class StringHelpers_androidKt {
-  }
-
-  public final class StringHelpers_jvmKt {
-  }
-
-  public final class TextDelegateKt {
-  }
-
-  public final class TextFieldCursorKt {
-  }
-
-  public final class TextFieldDelegateKt {
-  }
-
-  public final class TextFieldFocusModifier_androidKt {
-  }
-
-  public final class TextFieldGestureModifiersKt {
-  }
-
-  public final class TextFieldKeyInputKt {
-  }
-
-  public final class TextFieldKeyInput_androidKt {
-  }
-
-  public final class TextFieldPressGestureFilterKt {
-  }
-
-  public final class TextFieldScrollKt {
-  }
-
-  public final class TextFieldSizeKt {
-  }
-
-  public final class TextLayoutHelperKt {
-  }
-
-  public final class TextLayoutResultProxyKt {
-  }
-
-  public final class TextPointerIcon_androidKt {
-  }
-
-  public final class TouchMode_androidKt {
-  }
-
-  public final class UndoManagerKt {
-  }
-
-  public final class UndoManager_jvmKt {
-  }
-
-  public final class ValidatingOffsetMappingKt {
-  }
-
 }
 
 package androidx.compose.foundation.text.selection {
 
-  public final class AndroidSelectionHandles_androidKt {
-  }
-
-  public final class MultiWidgetSelectionDelegateKt {
-  }
-
-  public final class SelectionAdjustmentKt {
-  }
-
   public final class SelectionContainerKt {
     method @androidx.compose.runtime.Composable public static void DisableSelection(kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void SelectionContainer(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class SelectionHandlesKt {
-  }
-
-  public final class SelectionMagnifierKt {
-  }
-
-  public final class SelectionManagerKt {
-  }
-
-  public final class SelectionManager_androidKt {
-  }
-
-  public final class SelectionRegistrarKt {
-  }
-
-  public final class SimpleLayoutKt {
-  }
-
-  public final class TextFieldSelectionDelegateKt {
-  }
-
-  public final class TextFieldSelectionManagerKt {
-  }
-
-  public final class TextFieldSelectionManager_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class TextSelectionColors {
     ctor public TextSelectionColors(long handleColor, long backgroundColor);
     method public long getBackgroundColor();
@@ -1139,11 +907,5 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> LocalTextSelectionColors;
   }
 
-  public final class TextSelectionDelegateKt {
-  }
-
-  public final class TextSelectionMouseDetectorKt {
-  }
-
 }
 
diff --git a/compose/foundation/foundation/api/public_plus_experimental_1.4.0-beta01.txt b/compose/foundation/foundation/api/public_plus_experimental_1.4.0-beta01.txt
index d74aeec..9c5def2 100644
--- a/compose/foundation/foundation/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/foundation/foundation/api/public_plus_experimental_1.4.0-beta01.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.foundation {
 
-  public final class ActualJvmKt {
-  }
-
-  public final class AndroidOverscrollKt {
-  }
-
   public final class BackgroundKt {
     method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, long color, optional androidx.compose.ui.graphics.Shape shape);
     method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shape shape, optional float alpha);
@@ -60,9 +54,6 @@
     method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
   }
 
-  public final class Clickable_androidKt {
-  }
-
   public final class ClipScrollableContainerKt {
     method public static androidx.compose.ui.Modifier clipScrollableContainer(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.Orientation orientation);
   }
@@ -71,9 +62,6 @@
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean isSystemInDarkTheme();
   }
 
-  public final class DarkTheme_androidKt {
-  }
-
   public final class ExcludeFromSystemGesture_androidKt {
     method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier);
     method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
@@ -237,19 +225,10 @@
     method public static androidx.compose.ui.Modifier systemGestureExclusion(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
   }
 
-  public final class TempListUtilsKt {
-  }
-
 }
 
 package androidx.compose.foundation.gestures {
 
-  public final class AndroidScrollable_androidKt {
-  }
-
-  public final class ContentInViewModifierKt {
-  }
-
   public final class DragGestureDetectorKt {
     method public static suspend Object? awaitDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
     method public static suspend Object? awaitHorizontalDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
@@ -518,18 +497,8 @@
 
 }
 
-package androidx.compose.foundation.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.foundation.lazy {
 
-  public final class LazyBeyondBoundsModifierKt {
-  }
-
   public final class LazyDslKt {
     method @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,? extends kotlin.Unit> content);
@@ -552,9 +521,6 @@
     method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
   }
 
-  public final class LazyListHeadersKt {
-  }
-
   public interface LazyListItemInfo {
     method public int getIndex();
     method public Object getKey();
@@ -566,15 +532,6 @@
     property public abstract int size;
   }
 
-  public final class LazyListItemPlacementAnimatorKt {
-  }
-
-  public final class LazyListItemProviderKt {
-  }
-
-  public final class LazyListKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyListLayoutInfo {
     method public default int getAfterContentPadding();
     method public default int getBeforeContentPadding();
@@ -598,9 +555,6 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyListMeasureKt {
-  }
-
   @androidx.compose.foundation.lazy.LazyScopeMarker @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyListScope {
     method public default void item(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
     method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,? extends kotlin.Unit> content);
@@ -642,9 +596,6 @@
   @kotlin.DslMarker public @interface LazyScopeMarker {
   }
 
-  public final class LazySemanticsKt {
-  }
-
 }
 
 package androidx.compose.foundation.lazy.grid {
@@ -700,12 +651,6 @@
     field public static final int UnknownRow = -1; // 0xffffffff
   }
 
-  public final class LazyGridItemPlacementAnimatorKt {
-  }
-
-  public final class LazyGridItemProviderKt {
-  }
-
   @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker @androidx.compose.runtime.Stable public sealed interface LazyGridItemScope {
     method @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.ui.Modifier animateItemPlacement(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
   }
@@ -717,9 +662,6 @@
     property public abstract int maxLineSpan;
   }
 
-  public final class LazyGridKt {
-  }
-
   public sealed interface LazyGridLayoutInfo {
     method public int getAfterContentPadding();
     method public int getBeforeContentPadding();
@@ -743,9 +685,6 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.grid.LazyGridItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyGridMeasureKt {
-  }
-
   @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridScope {
     method public void item(optional Object? key, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,kotlin.Unit> content);
     method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
@@ -788,9 +727,6 @@
     method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.grid.LazyGridState rememberLazyGridState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
   }
 
-  public final class LazySemanticsKt {
-  }
-
 }
 
 package androidx.compose.foundation.lazy.layout {
@@ -811,12 +747,6 @@
     property public final T! value;
   }
 
-  public final class IntervalListKt {
-  }
-
-  public final class LazyAnimateScrollKt {
-  }
-
   @androidx.compose.foundation.ExperimentalFoundationApi public interface LazyLayoutIntervalContent {
     method public default kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object>? getKey();
     method public default kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object> getType();
@@ -878,19 +808,10 @@
     method public void cancel();
   }
 
-  public final class LazyLayoutPrefetcher_androidKt {
-  }
-
-  public final class LazyLayoutSemanticsKt {
-  }
-
   public final class LazyNearestItemsRangeKt {
     method @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<kotlin.ranges.IntRange> rememberLazyNearestItemsRangeState(kotlin.jvm.functions.Function0<java.lang.Integer> firstVisibleItemIndex, kotlin.jvm.functions.Function0<java.lang.Integer> slidingWindowSize, kotlin.jvm.functions.Function0<java.lang.Integer> extraItemCount);
   }
 
-  public final class LazySaveableStateHolderKt {
-  }
-
   public final class Lazy_androidKt {
     method @androidx.compose.foundation.ExperimentalFoundationApi public static Object getDefaultLazyLayoutKey(int index);
   }
@@ -908,9 +829,6 @@
 
 package androidx.compose.foundation.lazy.staggeredgrid {
 
-  public final class LazyStaggeredGridCellsKt {
-  }
-
   public final class LazyStaggeredGridDslKt {
     method @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyHorizontalStaggeredGrid(androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells rows, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope,kotlin.Unit> content);
     method @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyVerticalStaggeredGrid(androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells columns, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope,kotlin.Unit> content);
@@ -933,15 +851,9 @@
     property public abstract long size;
   }
 
-  public final class LazyStaggeredGridItemProviderKt {
-  }
-
   @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface LazyStaggeredGridItemScope {
   }
 
-  public final class LazyStaggeredGridKt {
-  }
-
   @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface LazyStaggeredGridLayoutInfo {
     method public int getAfterContentPadding();
     method public int getBeforeContentPadding();
@@ -963,23 +875,11 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyStaggeredGridMeasureKt {
-  }
-
-  public final class LazyStaggeredGridMeasurePolicyKt {
-  }
-
-  public final class LazyStaggeredGridMeasureResultKt {
-  }
-
   @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface LazyStaggeredGridScope {
     method @androidx.compose.foundation.ExperimentalFoundationApi public void item(optional Object? key, optional Object? contentType, optional androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan? span, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,kotlin.Unit> content);
     method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan>? span, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
   }
 
-  public final class LazyStaggeredGridSemanticsKt {
-  }
-
   @androidx.compose.foundation.ExperimentalFoundationApi public final class LazyStaggeredGridState implements androidx.compose.foundation.gestures.ScrollableState {
     ctor public LazyStaggeredGridState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemOffset);
     method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -1115,9 +1015,6 @@
 
 package androidx.compose.foundation.relocation {
 
-  public final class BringIntoViewKt {
-  }
-
   @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface BringIntoViewRequester {
     method public suspend Object? bringIntoView(optional androidx.compose.ui.geometry.Rect? rect, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
   }
@@ -1136,9 +1033,6 @@
     method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier bringIntoViewResponder(androidx.compose.ui.Modifier, androidx.compose.foundation.relocation.BringIntoViewResponder responder);
   }
 
-  public final class BringIntoViewResponder_androidKt {
-  }
-
 }
 
 package androidx.compose.foundation.selection {
@@ -1266,9 +1160,6 @@
 
 package androidx.compose.foundation.text {
 
-  public final class AndroidCursorHandle_androidKt {
-  }
-
   public final class BasicTextFieldKt {
     method @androidx.compose.runtime.Composable public static void BasicTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
     method @androidx.compose.runtime.Composable public static void BasicTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
@@ -1288,18 +1179,6 @@
     method @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onHover, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional int overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
   }
 
-  public final class ContextMenu_androidKt {
-  }
-
-  public final class CoreTextFieldKt {
-  }
-
-  public final class CoreTextKt {
-  }
-
-  public final class HeightInLinesModifierKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class InlineTextContent {
     ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
     method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
@@ -1315,15 +1194,6 @@
   @kotlin.RequiresOptIn(message="Internal/Unstable API for use only between foundation modules sharing " + "the same exact version, subject to change without notice.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY_SETTER}) public @interface InternalFoundationTextApi {
   }
 
-  public final class KeyEventHelpers_androidKt {
-  }
-
-  public final class KeyMappingKt {
-  }
-
-  public final class KeyMapping_androidKt {
-  }
-
   public interface KeyboardActionScope {
     method public void defaultKeyboardAction(int imeAction);
   }
@@ -1373,117 +1243,15 @@
     property public final androidx.compose.foundation.text.KeyboardOptions Default;
   }
 
-  public final class LongPressTextDragObserverKt {
-  }
-
-  public final class PointerMoveDetectorKt {
-  }
-
-  public final class StringHelpersKt {
-  }
-
-  public final class StringHelpers_androidKt {
-  }
-
-  public final class StringHelpers_jvmKt {
-  }
-
-  public final class TextDelegateKt {
-  }
-
-  public final class TextFieldCursorKt {
-  }
-
-  public final class TextFieldDelegateKt {
-  }
-
-  public final class TextFieldFocusModifier_androidKt {
-  }
-
-  public final class TextFieldGestureModifiersKt {
-  }
-
-  public final class TextFieldKeyInputKt {
-  }
-
-  public final class TextFieldKeyInput_androidKt {
-  }
-
-  public final class TextFieldPressGestureFilterKt {
-  }
-
-  public final class TextFieldScrollKt {
-  }
-
-  public final class TextFieldSizeKt {
-  }
-
-  public final class TextLayoutHelperKt {
-  }
-
-  public final class TextLayoutResultProxyKt {
-  }
-
-  public final class TextPointerIcon_androidKt {
-  }
-
-  public final class TouchMode_androidKt {
-  }
-
-  public final class UndoManagerKt {
-  }
-
-  public final class UndoManager_jvmKt {
-  }
-
-  public final class ValidatingOffsetMappingKt {
-  }
-
 }
 
 package androidx.compose.foundation.text.selection {
 
-  public final class AndroidSelectionHandles_androidKt {
-  }
-
-  public final class MultiWidgetSelectionDelegateKt {
-  }
-
-  public final class SelectionAdjustmentKt {
-  }
-
   public final class SelectionContainerKt {
     method @androidx.compose.runtime.Composable public static void DisableSelection(kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void SelectionContainer(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class SelectionHandlesKt {
-  }
-
-  public final class SelectionMagnifierKt {
-  }
-
-  public final class SelectionManagerKt {
-  }
-
-  public final class SelectionManager_androidKt {
-  }
-
-  public final class SelectionRegistrarKt {
-  }
-
-  public final class SimpleLayoutKt {
-  }
-
-  public final class TextFieldSelectionDelegateKt {
-  }
-
-  public final class TextFieldSelectionManagerKt {
-  }
-
-  public final class TextFieldSelectionManager_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class TextSelectionColors {
     ctor public TextSelectionColors(long handleColor, long backgroundColor);
     method public long getBackgroundColor();
@@ -1497,11 +1265,5 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> LocalTextSelectionColors;
   }
 
-  public final class TextSelectionDelegateKt {
-  }
-
-  public final class TextSelectionMouseDetectorKt {
-  }
-
 }
 
diff --git a/compose/foundation/foundation/api/public_plus_experimental_current.txt b/compose/foundation/foundation/api/public_plus_experimental_current.txt
index d74aeec..9c5def2 100644
--- a/compose/foundation/foundation/api/public_plus_experimental_current.txt
+++ b/compose/foundation/foundation/api/public_plus_experimental_current.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.foundation {
 
-  public final class ActualJvmKt {
-  }
-
-  public final class AndroidOverscrollKt {
-  }
-
   public final class BackgroundKt {
     method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, long color, optional androidx.compose.ui.graphics.Shape shape);
     method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shape shape, optional float alpha);
@@ -60,9 +54,6 @@
     method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
   }
 
-  public final class Clickable_androidKt {
-  }
-
   public final class ClipScrollableContainerKt {
     method public static androidx.compose.ui.Modifier clipScrollableContainer(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.Orientation orientation);
   }
@@ -71,9 +62,6 @@
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean isSystemInDarkTheme();
   }
 
-  public final class DarkTheme_androidKt {
-  }
-
   public final class ExcludeFromSystemGesture_androidKt {
     method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier);
     method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
@@ -237,19 +225,10 @@
     method public static androidx.compose.ui.Modifier systemGestureExclusion(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
   }
 
-  public final class TempListUtilsKt {
-  }
-
 }
 
 package androidx.compose.foundation.gestures {
 
-  public final class AndroidScrollable_androidKt {
-  }
-
-  public final class ContentInViewModifierKt {
-  }
-
   public final class DragGestureDetectorKt {
     method public static suspend Object? awaitDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
     method public static suspend Object? awaitHorizontalDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
@@ -518,18 +497,8 @@
 
 }
 
-package androidx.compose.foundation.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.foundation.lazy {
 
-  public final class LazyBeyondBoundsModifierKt {
-  }
-
   public final class LazyDslKt {
     method @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,? extends kotlin.Unit> content);
@@ -552,9 +521,6 @@
     method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
   }
 
-  public final class LazyListHeadersKt {
-  }
-
   public interface LazyListItemInfo {
     method public int getIndex();
     method public Object getKey();
@@ -566,15 +532,6 @@
     property public abstract int size;
   }
 
-  public final class LazyListItemPlacementAnimatorKt {
-  }
-
-  public final class LazyListItemProviderKt {
-  }
-
-  public final class LazyListKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyListLayoutInfo {
     method public default int getAfterContentPadding();
     method public default int getBeforeContentPadding();
@@ -598,9 +555,6 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyListMeasureKt {
-  }
-
   @androidx.compose.foundation.lazy.LazyScopeMarker @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyListScope {
     method public default void item(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
     method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,? extends kotlin.Unit> content);
@@ -642,9 +596,6 @@
   @kotlin.DslMarker public @interface LazyScopeMarker {
   }
 
-  public final class LazySemanticsKt {
-  }
-
 }
 
 package androidx.compose.foundation.lazy.grid {
@@ -700,12 +651,6 @@
     field public static final int UnknownRow = -1; // 0xffffffff
   }
 
-  public final class LazyGridItemPlacementAnimatorKt {
-  }
-
-  public final class LazyGridItemProviderKt {
-  }
-
   @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker @androidx.compose.runtime.Stable public sealed interface LazyGridItemScope {
     method @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.ui.Modifier animateItemPlacement(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
   }
@@ -717,9 +662,6 @@
     property public abstract int maxLineSpan;
   }
 
-  public final class LazyGridKt {
-  }
-
   public sealed interface LazyGridLayoutInfo {
     method public int getAfterContentPadding();
     method public int getBeforeContentPadding();
@@ -743,9 +685,6 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.grid.LazyGridItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyGridMeasureKt {
-  }
-
   @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridScope {
     method public void item(optional Object? key, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,kotlin.Unit> content);
     method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
@@ -788,9 +727,6 @@
     method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.grid.LazyGridState rememberLazyGridState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
   }
 
-  public final class LazySemanticsKt {
-  }
-
 }
 
 package androidx.compose.foundation.lazy.layout {
@@ -811,12 +747,6 @@
     property public final T! value;
   }
 
-  public final class IntervalListKt {
-  }
-
-  public final class LazyAnimateScrollKt {
-  }
-
   @androidx.compose.foundation.ExperimentalFoundationApi public interface LazyLayoutIntervalContent {
     method public default kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object>? getKey();
     method public default kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object> getType();
@@ -878,19 +808,10 @@
     method public void cancel();
   }
 
-  public final class LazyLayoutPrefetcher_androidKt {
-  }
-
-  public final class LazyLayoutSemanticsKt {
-  }
-
   public final class LazyNearestItemsRangeKt {
     method @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<kotlin.ranges.IntRange> rememberLazyNearestItemsRangeState(kotlin.jvm.functions.Function0<java.lang.Integer> firstVisibleItemIndex, kotlin.jvm.functions.Function0<java.lang.Integer> slidingWindowSize, kotlin.jvm.functions.Function0<java.lang.Integer> extraItemCount);
   }
 
-  public final class LazySaveableStateHolderKt {
-  }
-
   public final class Lazy_androidKt {
     method @androidx.compose.foundation.ExperimentalFoundationApi public static Object getDefaultLazyLayoutKey(int index);
   }
@@ -908,9 +829,6 @@
 
 package androidx.compose.foundation.lazy.staggeredgrid {
 
-  public final class LazyStaggeredGridCellsKt {
-  }
-
   public final class LazyStaggeredGridDslKt {
     method @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyHorizontalStaggeredGrid(androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells rows, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope,kotlin.Unit> content);
     method @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyVerticalStaggeredGrid(androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells columns, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope,kotlin.Unit> content);
@@ -933,15 +851,9 @@
     property public abstract long size;
   }
 
-  public final class LazyStaggeredGridItemProviderKt {
-  }
-
   @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface LazyStaggeredGridItemScope {
   }
 
-  public final class LazyStaggeredGridKt {
-  }
-
   @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface LazyStaggeredGridLayoutInfo {
     method public int getAfterContentPadding();
     method public int getBeforeContentPadding();
@@ -963,23 +875,11 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyStaggeredGridMeasureKt {
-  }
-
-  public final class LazyStaggeredGridMeasurePolicyKt {
-  }
-
-  public final class LazyStaggeredGridMeasureResultKt {
-  }
-
   @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface LazyStaggeredGridScope {
     method @androidx.compose.foundation.ExperimentalFoundationApi public void item(optional Object? key, optional Object? contentType, optional androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan? span, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,kotlin.Unit> content);
     method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan>? span, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
   }
 
-  public final class LazyStaggeredGridSemanticsKt {
-  }
-
   @androidx.compose.foundation.ExperimentalFoundationApi public final class LazyStaggeredGridState implements androidx.compose.foundation.gestures.ScrollableState {
     ctor public LazyStaggeredGridState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemOffset);
     method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -1115,9 +1015,6 @@
 
 package androidx.compose.foundation.relocation {
 
-  public final class BringIntoViewKt {
-  }
-
   @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface BringIntoViewRequester {
     method public suspend Object? bringIntoView(optional androidx.compose.ui.geometry.Rect? rect, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
   }
@@ -1136,9 +1033,6 @@
     method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier bringIntoViewResponder(androidx.compose.ui.Modifier, androidx.compose.foundation.relocation.BringIntoViewResponder responder);
   }
 
-  public final class BringIntoViewResponder_androidKt {
-  }
-
 }
 
 package androidx.compose.foundation.selection {
@@ -1266,9 +1160,6 @@
 
 package androidx.compose.foundation.text {
 
-  public final class AndroidCursorHandle_androidKt {
-  }
-
   public final class BasicTextFieldKt {
     method @androidx.compose.runtime.Composable public static void BasicTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
     method @androidx.compose.runtime.Composable public static void BasicTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
@@ -1288,18 +1179,6 @@
     method @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onHover, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional int overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
   }
 
-  public final class ContextMenu_androidKt {
-  }
-
-  public final class CoreTextFieldKt {
-  }
-
-  public final class CoreTextKt {
-  }
-
-  public final class HeightInLinesModifierKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class InlineTextContent {
     ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
     method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
@@ -1315,15 +1194,6 @@
   @kotlin.RequiresOptIn(message="Internal/Unstable API for use only between foundation modules sharing " + "the same exact version, subject to change without notice.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY_SETTER}) public @interface InternalFoundationTextApi {
   }
 
-  public final class KeyEventHelpers_androidKt {
-  }
-
-  public final class KeyMappingKt {
-  }
-
-  public final class KeyMapping_androidKt {
-  }
-
   public interface KeyboardActionScope {
     method public void defaultKeyboardAction(int imeAction);
   }
@@ -1373,117 +1243,15 @@
     property public final androidx.compose.foundation.text.KeyboardOptions Default;
   }
 
-  public final class LongPressTextDragObserverKt {
-  }
-
-  public final class PointerMoveDetectorKt {
-  }
-
-  public final class StringHelpersKt {
-  }
-
-  public final class StringHelpers_androidKt {
-  }
-
-  public final class StringHelpers_jvmKt {
-  }
-
-  public final class TextDelegateKt {
-  }
-
-  public final class TextFieldCursorKt {
-  }
-
-  public final class TextFieldDelegateKt {
-  }
-
-  public final class TextFieldFocusModifier_androidKt {
-  }
-
-  public final class TextFieldGestureModifiersKt {
-  }
-
-  public final class TextFieldKeyInputKt {
-  }
-
-  public final class TextFieldKeyInput_androidKt {
-  }
-
-  public final class TextFieldPressGestureFilterKt {
-  }
-
-  public final class TextFieldScrollKt {
-  }
-
-  public final class TextFieldSizeKt {
-  }
-
-  public final class TextLayoutHelperKt {
-  }
-
-  public final class TextLayoutResultProxyKt {
-  }
-
-  public final class TextPointerIcon_androidKt {
-  }
-
-  public final class TouchMode_androidKt {
-  }
-
-  public final class UndoManagerKt {
-  }
-
-  public final class UndoManager_jvmKt {
-  }
-
-  public final class ValidatingOffsetMappingKt {
-  }
-
 }
 
 package androidx.compose.foundation.text.selection {
 
-  public final class AndroidSelectionHandles_androidKt {
-  }
-
-  public final class MultiWidgetSelectionDelegateKt {
-  }
-
-  public final class SelectionAdjustmentKt {
-  }
-
   public final class SelectionContainerKt {
     method @androidx.compose.runtime.Composable public static void DisableSelection(kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void SelectionContainer(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class SelectionHandlesKt {
-  }
-
-  public final class SelectionMagnifierKt {
-  }
-
-  public final class SelectionManagerKt {
-  }
-
-  public final class SelectionManager_androidKt {
-  }
-
-  public final class SelectionRegistrarKt {
-  }
-
-  public final class SimpleLayoutKt {
-  }
-
-  public final class TextFieldSelectionDelegateKt {
-  }
-
-  public final class TextFieldSelectionManagerKt {
-  }
-
-  public final class TextFieldSelectionManager_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class TextSelectionColors {
     ctor public TextSelectionColors(long handleColor, long backgroundColor);
     method public long getBackgroundColor();
@@ -1497,11 +1265,5 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> LocalTextSelectionColors;
   }
 
-  public final class TextSelectionDelegateKt {
-  }
-
-  public final class TextSelectionMouseDetectorKt {
-  }
-
 }
 
diff --git a/compose/foundation/foundation/api/restricted_1.4.0-beta01.txt b/compose/foundation/foundation/api/restricted_1.4.0-beta01.txt
index 1c8281c..4ea5f3c 100644
--- a/compose/foundation/foundation/api/restricted_1.4.0-beta01.txt
+++ b/compose/foundation/foundation/api/restricted_1.4.0-beta01.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.foundation {
 
-  public final class ActualJvmKt {
-  }
-
-  public final class AndroidOverscrollKt {
-  }
-
   public final class BackgroundKt {
     method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, long color, optional androidx.compose.ui.graphics.Shape shape);
     method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shape shape, optional float alpha);
@@ -47,9 +41,6 @@
     method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
   }
 
-  public final class Clickable_androidKt {
-  }
-
   public final class ClipScrollableContainerKt {
     method public static androidx.compose.ui.Modifier clipScrollableContainer(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.Orientation orientation);
   }
@@ -58,9 +49,6 @@
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean isSystemInDarkTheme();
   }
 
-  public final class DarkTheme_androidKt {
-  }
-
   public final class ExcludeFromSystemGesture_androidKt {
     method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier);
     method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
@@ -161,19 +149,10 @@
     method public static androidx.compose.ui.Modifier systemGestureExclusion(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
   }
 
-  public final class TempListUtilsKt {
-  }
-
 }
 
 package androidx.compose.foundation.gestures {
 
-  public final class AndroidScrollable_androidKt {
-  }
-
-  public final class ContentInViewModifierKt {
-  }
-
   public final class DragGestureDetectorKt {
     method public static suspend Object? awaitDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
     method public static suspend Object? awaitHorizontalDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
@@ -425,18 +404,8 @@
 
 }
 
-package androidx.compose.foundation.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.foundation.lazy {
 
-  public final class LazyBeyondBoundsModifierKt {
-  }
-
   public final class LazyDslKt {
     method @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,? extends kotlin.Unit> content);
@@ -458,9 +427,6 @@
     method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
   }
 
-  public final class LazyListHeadersKt {
-  }
-
   public interface LazyListItemInfo {
     method public int getIndex();
     method public Object getKey();
@@ -472,15 +438,6 @@
     property public abstract int size;
   }
 
-  public final class LazyListItemPlacementAnimatorKt {
-  }
-
-  public final class LazyListItemProviderKt {
-  }
-
-  public final class LazyListKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyListLayoutInfo {
     method public default int getAfterContentPadding();
     method public default int getBeforeContentPadding();
@@ -504,9 +461,6 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyListMeasureKt {
-  }
-
   @androidx.compose.foundation.lazy.LazyScopeMarker @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyListScope {
     method public default void item(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
     method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,? extends kotlin.Unit> content);
@@ -547,9 +501,6 @@
   @kotlin.DslMarker public @interface LazyScopeMarker {
   }
 
-  public final class LazySemanticsKt {
-  }
-
 }
 
 package androidx.compose.foundation.lazy.grid {
@@ -604,12 +555,6 @@
     field public static final int UnknownRow = -1; // 0xffffffff
   }
 
-  public final class LazyGridItemPlacementAnimatorKt {
-  }
-
-  public final class LazyGridItemProviderKt {
-  }
-
   @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker @androidx.compose.runtime.Stable public sealed interface LazyGridItemScope {
   }
 
@@ -620,9 +565,6 @@
     property public abstract int maxLineSpan;
   }
 
-  public final class LazyGridKt {
-  }
-
   public sealed interface LazyGridLayoutInfo {
     method public int getAfterContentPadding();
     method public int getBeforeContentPadding();
@@ -646,9 +588,6 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.grid.LazyGridItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyGridMeasureKt {
-  }
-
   @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridScope {
     method public void item(optional Object? key, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,kotlin.Unit> content);
     method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
@@ -691,19 +630,10 @@
     method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.grid.LazyGridState rememberLazyGridState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
   }
 
-  public final class LazySemanticsKt {
-  }
-
 }
 
 package androidx.compose.foundation.lazy.layout {
 
-  public final class IntervalListKt {
-  }
-
-  public final class LazyAnimateScrollKt {
-  }
-
   public final class LazyLayoutItemProviderKt {
   }
 
@@ -713,18 +643,9 @@
   public final class LazyLayoutPinnableItemKt {
   }
 
-  public final class LazyLayoutPrefetcher_androidKt {
-  }
-
-  public final class LazyLayoutSemanticsKt {
-  }
-
   public final class LazyNearestItemsRangeKt {
   }
 
-  public final class LazySaveableStateHolderKt {
-  }
-
   public final class Lazy_androidKt {
   }
 
@@ -732,30 +653,9 @@
 
 package androidx.compose.foundation.lazy.staggeredgrid {
 
-  public final class LazyStaggeredGridCellsKt {
-  }
-
   public final class LazyStaggeredGridDslKt {
   }
 
-  public final class LazyStaggeredGridItemProviderKt {
-  }
-
-  public final class LazyStaggeredGridKt {
-  }
-
-  public final class LazyStaggeredGridMeasureKt {
-  }
-
-  public final class LazyStaggeredGridMeasurePolicyKt {
-  }
-
-  public final class LazyStaggeredGridMeasureResultKt {
-  }
-
-  public final class LazyStaggeredGridSemanticsKt {
-  }
-
   public final class LazyStaggeredGridStateKt {
   }
 
@@ -773,18 +673,12 @@
 
 package androidx.compose.foundation.relocation {
 
-  public final class BringIntoViewKt {
-  }
-
   public final class BringIntoViewRequesterKt {
   }
 
   public final class BringIntoViewResponderKt {
   }
 
-  public final class BringIntoViewResponder_androidKt {
-  }
-
 }
 
 package androidx.compose.foundation.selection {
@@ -912,9 +806,6 @@
 
 package androidx.compose.foundation.text {
 
-  public final class AndroidCursorHandle_androidKt {
-  }
-
   public final class BasicTextFieldKt {
     method @androidx.compose.runtime.Composable public static void BasicTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
     method @androidx.compose.runtime.Composable public static void BasicTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
@@ -933,18 +824,6 @@
     method @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional int overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
   }
 
-  public final class ContextMenu_androidKt {
-  }
-
-  public final class CoreTextFieldKt {
-  }
-
-  public final class CoreTextKt {
-  }
-
-  public final class HeightInLinesModifierKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class InlineTextContent {
     ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
     method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
@@ -957,15 +836,6 @@
     method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, optional String alternateText);
   }
 
-  public final class KeyEventHelpers_androidKt {
-  }
-
-  public final class KeyMappingKt {
-  }
-
-  public final class KeyMapping_androidKt {
-  }
-
   public interface KeyboardActionScope {
     method public void defaultKeyboardAction(int imeAction);
   }
@@ -1015,117 +885,15 @@
     property public final androidx.compose.foundation.text.KeyboardOptions Default;
   }
 
-  public final class LongPressTextDragObserverKt {
-  }
-
-  public final class PointerMoveDetectorKt {
-  }
-
-  public final class StringHelpersKt {
-  }
-
-  public final class StringHelpers_androidKt {
-  }
-
-  public final class StringHelpers_jvmKt {
-  }
-
-  public final class TextDelegateKt {
-  }
-
-  public final class TextFieldCursorKt {
-  }
-
-  public final class TextFieldDelegateKt {
-  }
-
-  public final class TextFieldFocusModifier_androidKt {
-  }
-
-  public final class TextFieldGestureModifiersKt {
-  }
-
-  public final class TextFieldKeyInputKt {
-  }
-
-  public final class TextFieldKeyInput_androidKt {
-  }
-
-  public final class TextFieldPressGestureFilterKt {
-  }
-
-  public final class TextFieldScrollKt {
-  }
-
-  public final class TextFieldSizeKt {
-  }
-
-  public final class TextLayoutHelperKt {
-  }
-
-  public final class TextLayoutResultProxyKt {
-  }
-
-  public final class TextPointerIcon_androidKt {
-  }
-
-  public final class TouchMode_androidKt {
-  }
-
-  public final class UndoManagerKt {
-  }
-
-  public final class UndoManager_jvmKt {
-  }
-
-  public final class ValidatingOffsetMappingKt {
-  }
-
 }
 
 package androidx.compose.foundation.text.selection {
 
-  public final class AndroidSelectionHandles_androidKt {
-  }
-
-  public final class MultiWidgetSelectionDelegateKt {
-  }
-
-  public final class SelectionAdjustmentKt {
-  }
-
   public final class SelectionContainerKt {
     method @androidx.compose.runtime.Composable public static void DisableSelection(kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void SelectionContainer(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class SelectionHandlesKt {
-  }
-
-  public final class SelectionMagnifierKt {
-  }
-
-  public final class SelectionManagerKt {
-  }
-
-  public final class SelectionManager_androidKt {
-  }
-
-  public final class SelectionRegistrarKt {
-  }
-
-  public final class SimpleLayoutKt {
-  }
-
-  public final class TextFieldSelectionDelegateKt {
-  }
-
-  public final class TextFieldSelectionManagerKt {
-  }
-
-  public final class TextFieldSelectionManager_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class TextSelectionColors {
     ctor public TextSelectionColors(long handleColor, long backgroundColor);
     method public long getBackgroundColor();
@@ -1139,11 +907,5 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> LocalTextSelectionColors;
   }
 
-  public final class TextSelectionDelegateKt {
-  }
-
-  public final class TextSelectionMouseDetectorKt {
-  }
-
 }
 
diff --git a/compose/foundation/foundation/api/restricted_current.ignore b/compose/foundation/foundation/api/restricted_current.ignore
index d1a4e31..414998d 100644
--- a/compose/foundation/foundation/api/restricted_current.ignore
+++ b/compose/foundation/foundation/api/restricted_current.ignore
@@ -3,15 +3,165 @@
     Added method androidx.compose.foundation.lazy.grid.LazyGridLayoutInfo.getMainAxisItemSpacing()
 
 
+RemovedClass: androidx.compose.foundation.ActualJvmKt:
+    Removed class androidx.compose.foundation.ActualJvmKt
+RemovedClass: androidx.compose.foundation.AndroidOverscrollKt:
+    Removed class androidx.compose.foundation.AndroidOverscrollKt
+RemovedClass: androidx.compose.foundation.Clickable_androidKt:
+    Removed class androidx.compose.foundation.Clickable_androidKt
+RemovedClass: androidx.compose.foundation.DarkTheme_androidKt:
+    Removed class androidx.compose.foundation.DarkTheme_androidKt
+RemovedClass: androidx.compose.foundation.TempListUtilsKt:
+    Removed class androidx.compose.foundation.TempListUtilsKt
+RemovedClass: androidx.compose.foundation.gestures.AndroidScrollable_androidKt:
+    Removed class androidx.compose.foundation.gestures.AndroidScrollable_androidKt
+RemovedClass: androidx.compose.foundation.lazy.LazyBeyondBoundsModifierKt:
+    Removed class androidx.compose.foundation.lazy.LazyBeyondBoundsModifierKt
+RemovedClass: androidx.compose.foundation.lazy.LazyListHeadersKt:
+    Removed class androidx.compose.foundation.lazy.LazyListHeadersKt
+RemovedClass: androidx.compose.foundation.lazy.LazyListItemPlacementAnimatorKt:
+    Removed class androidx.compose.foundation.lazy.LazyListItemPlacementAnimatorKt
+RemovedClass: androidx.compose.foundation.lazy.LazyListItemProviderKt:
+    Removed class androidx.compose.foundation.lazy.LazyListItemProviderKt
+RemovedClass: androidx.compose.foundation.lazy.LazyListKt:
+    Removed class androidx.compose.foundation.lazy.LazyListKt
+RemovedClass: androidx.compose.foundation.lazy.LazyListMeasureKt:
+    Removed class androidx.compose.foundation.lazy.LazyListMeasureKt
 RemovedClass: androidx.compose.foundation.lazy.LazyListPinningModifierKt:
     Removed class androidx.compose.foundation.lazy.LazyListPinningModifierKt
+RemovedClass: androidx.compose.foundation.lazy.LazySemanticsKt:
+    Removed class androidx.compose.foundation.lazy.LazySemanticsKt
+RemovedClass: androidx.compose.foundation.lazy.grid.LazyGridItemPlacementAnimatorKt:
+    Removed class androidx.compose.foundation.lazy.grid.LazyGridItemPlacementAnimatorKt
+RemovedClass: androidx.compose.foundation.lazy.grid.LazyGridItemProviderKt:
+    Removed class androidx.compose.foundation.lazy.grid.LazyGridItemProviderKt
+RemovedClass: androidx.compose.foundation.lazy.grid.LazyGridKt:
+    Removed class androidx.compose.foundation.lazy.grid.LazyGridKt
+RemovedClass: androidx.compose.foundation.lazy.grid.LazyGridMeasureKt:
+    Removed class androidx.compose.foundation.lazy.grid.LazyGridMeasureKt
+RemovedClass: androidx.compose.foundation.lazy.grid.LazySemanticsKt:
+    Removed class androidx.compose.foundation.lazy.grid.LazySemanticsKt
+RemovedClass: androidx.compose.foundation.lazy.layout.IntervalListKt:
+    Removed class androidx.compose.foundation.lazy.layout.IntervalListKt
+RemovedClass: androidx.compose.foundation.lazy.layout.LazyAnimateScrollKt:
+    Removed class androidx.compose.foundation.lazy.layout.LazyAnimateScrollKt
+RemovedClass: androidx.compose.foundation.lazy.layout.LazyLayoutPrefetcher_androidKt:
+    Removed class androidx.compose.foundation.lazy.layout.LazyLayoutPrefetcher_androidKt
+RemovedClass: androidx.compose.foundation.lazy.layout.LazyLayoutSemanticsKt:
+    Removed class androidx.compose.foundation.lazy.layout.LazyLayoutSemanticsKt
+RemovedClass: androidx.compose.foundation.lazy.layout.LazySaveableStateHolderKt:
+    Removed class androidx.compose.foundation.lazy.layout.LazySaveableStateHolderKt
 RemovedClass: androidx.compose.foundation.lazy.layout.PinnableParentKt:
     Removed class androidx.compose.foundation.lazy.layout.PinnableParentKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridCellsKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridCellsKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemProviderKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemProviderKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridMeasureKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridMeasureKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridMeasurePolicyKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridMeasurePolicyKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridMeasureResultKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridMeasureResultKt
+RemovedClass: androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridSemanticsKt:
+    Removed class androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridSemanticsKt
+RemovedClass: androidx.compose.foundation.relocation.BringIntoViewKt:
+    Removed class androidx.compose.foundation.relocation.BringIntoViewKt
+RemovedClass: androidx.compose.foundation.relocation.BringIntoViewResponder_androidKt:
+    Removed class androidx.compose.foundation.relocation.BringIntoViewResponder_androidKt
+RemovedClass: androidx.compose.foundation.text.AndroidCursorHandle_androidKt:
+    Removed class androidx.compose.foundation.text.AndroidCursorHandle_androidKt
+RemovedClass: androidx.compose.foundation.text.ContextMenu_androidKt:
+    Removed class androidx.compose.foundation.text.ContextMenu_androidKt
+RemovedClass: androidx.compose.foundation.text.CoreTextFieldKt:
+    Removed class androidx.compose.foundation.text.CoreTextFieldKt
+RemovedClass: androidx.compose.foundation.text.CoreTextKt:
+    Removed class androidx.compose.foundation.text.CoreTextKt
+RemovedClass: androidx.compose.foundation.text.KeyEventHelpers_androidKt:
+    Removed class androidx.compose.foundation.text.KeyEventHelpers_androidKt
+RemovedClass: androidx.compose.foundation.text.KeyMappingKt:
+    Removed class androidx.compose.foundation.text.KeyMappingKt
+RemovedClass: androidx.compose.foundation.text.KeyMapping_androidKt:
+    Removed class androidx.compose.foundation.text.KeyMapping_androidKt
+RemovedClass: androidx.compose.foundation.text.LongPressTextDragObserverKt:
+    Removed class androidx.compose.foundation.text.LongPressTextDragObserverKt
 RemovedClass: androidx.compose.foundation.text.MaxLinesHeightModifierKt:
     Removed class androidx.compose.foundation.text.MaxLinesHeightModifierKt
+RemovedClass: androidx.compose.foundation.text.StringHelpersKt:
+    Removed class androidx.compose.foundation.text.StringHelpersKt
+RemovedClass: androidx.compose.foundation.text.StringHelpers_androidKt:
+    Removed class androidx.compose.foundation.text.StringHelpers_androidKt
+RemovedClass: androidx.compose.foundation.text.StringHelpers_jvmKt:
+    Removed class androidx.compose.foundation.text.StringHelpers_jvmKt
+RemovedClass: androidx.compose.foundation.text.TextDelegateKt:
+    Removed class androidx.compose.foundation.text.TextDelegateKt
+RemovedClass: androidx.compose.foundation.text.TextFieldCursorKt:
+    Removed class androidx.compose.foundation.text.TextFieldCursorKt
+RemovedClass: androidx.compose.foundation.text.TextFieldDelegateKt:
+    Removed class androidx.compose.foundation.text.TextFieldDelegateKt
+RemovedClass: androidx.compose.foundation.text.TextFieldGestureModifiersKt:
+    Removed class androidx.compose.foundation.text.TextFieldGestureModifiersKt
+RemovedClass: androidx.compose.foundation.text.TextFieldKeyInputKt:
+    Removed class androidx.compose.foundation.text.TextFieldKeyInputKt
+RemovedClass: androidx.compose.foundation.text.TextFieldKeyInput_androidKt:
+    Removed class androidx.compose.foundation.text.TextFieldKeyInput_androidKt
+RemovedClass: androidx.compose.foundation.text.TextFieldPressGestureFilterKt:
+    Removed class androidx.compose.foundation.text.TextFieldPressGestureFilterKt
+RemovedClass: androidx.compose.foundation.text.TextFieldScrollKt:
+    Removed class androidx.compose.foundation.text.TextFieldScrollKt
+RemovedClass: androidx.compose.foundation.text.TextFieldSizeKt:
+    Removed class androidx.compose.foundation.text.TextFieldSizeKt
+RemovedClass: androidx.compose.foundation.text.TextLayoutHelperKt:
+    Removed class androidx.compose.foundation.text.TextLayoutHelperKt
+RemovedClass: androidx.compose.foundation.text.TextLayoutResultProxyKt:
+    Removed class androidx.compose.foundation.text.TextLayoutResultProxyKt
+RemovedClass: androidx.compose.foundation.text.TextPointerIcon_androidKt:
+    Removed class androidx.compose.foundation.text.TextPointerIcon_androidKt
+RemovedClass: androidx.compose.foundation.text.TouchMode_androidKt:
+    Removed class androidx.compose.foundation.text.TouchMode_androidKt
+RemovedClass: androidx.compose.foundation.text.UndoManagerKt:
+    Removed class androidx.compose.foundation.text.UndoManagerKt
+RemovedClass: androidx.compose.foundation.text.UndoManager_jvmKt:
+    Removed class androidx.compose.foundation.text.UndoManager_jvmKt
+RemovedClass: androidx.compose.foundation.text.ValidatingOffsetMappingKt:
+    Removed class androidx.compose.foundation.text.ValidatingOffsetMappingKt
+RemovedClass: androidx.compose.foundation.text.selection.AndroidSelectionHandles_androidKt:
+    Removed class androidx.compose.foundation.text.selection.AndroidSelectionHandles_androidKt
+RemovedClass: androidx.compose.foundation.text.selection.MultiWidgetSelectionDelegateKt:
+    Removed class androidx.compose.foundation.text.selection.MultiWidgetSelectionDelegateKt
+RemovedClass: androidx.compose.foundation.text.selection.SelectionAdjustmentKt:
+    Removed class androidx.compose.foundation.text.selection.SelectionAdjustmentKt
+RemovedClass: androidx.compose.foundation.text.selection.SelectionHandlesKt:
+    Removed class androidx.compose.foundation.text.selection.SelectionHandlesKt
+RemovedClass: androidx.compose.foundation.text.selection.SelectionMagnifierKt:
+    Removed class androidx.compose.foundation.text.selection.SelectionMagnifierKt
+RemovedClass: androidx.compose.foundation.text.selection.SelectionManagerKt:
+    Removed class androidx.compose.foundation.text.selection.SelectionManagerKt
+RemovedClass: androidx.compose.foundation.text.selection.SelectionManager_androidKt:
+    Removed class androidx.compose.foundation.text.selection.SelectionManager_androidKt
+RemovedClass: androidx.compose.foundation.text.selection.SelectionRegistrarKt:
+    Removed class androidx.compose.foundation.text.selection.SelectionRegistrarKt
+RemovedClass: androidx.compose.foundation.text.selection.SimpleLayoutKt:
+    Removed class androidx.compose.foundation.text.selection.SimpleLayoutKt
+RemovedClass: androidx.compose.foundation.text.selection.TextFieldSelectionDelegateKt:
+    Removed class androidx.compose.foundation.text.selection.TextFieldSelectionDelegateKt
+RemovedClass: androidx.compose.foundation.text.selection.TextFieldSelectionManagerKt:
+    Removed class androidx.compose.foundation.text.selection.TextFieldSelectionManagerKt
+RemovedClass: androidx.compose.foundation.text.selection.TextFieldSelectionManager_androidKt:
+    Removed class androidx.compose.foundation.text.selection.TextFieldSelectionManager_androidKt
+RemovedClass: androidx.compose.foundation.text.selection.TextSelectionDelegateKt:
+    Removed class androidx.compose.foundation.text.selection.TextSelectionDelegateKt
+RemovedClass: androidx.compose.foundation.text.selection.TextSelectionMouseDetectorKt:
+    Removed class androidx.compose.foundation.text.selection.TextSelectionMouseDetectorKt
 
 
 RemovedMethod: androidx.compose.foundation.gestures.TapGestureDetectorKt#awaitFirstDown(androidx.compose.ui.input.pointer.AwaitPointerEventScope, boolean, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>):
     Removed method androidx.compose.foundation.gestures.TapGestureDetectorKt.awaitFirstDown(androidx.compose.ui.input.pointer.AwaitPointerEventScope,boolean,kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>)
 RemovedMethod: androidx.compose.foundation.gestures.TapGestureDetectorKt#waitForUpOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>):
     Removed method androidx.compose.foundation.gestures.TapGestureDetectorKt.waitForUpOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope,kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>)
+
+
+RemovedPackage: androidx.compose.foundation.internal:
+    Removed package androidx.compose.foundation.internal
diff --git a/compose/foundation/foundation/api/restricted_current.txt b/compose/foundation/foundation/api/restricted_current.txt
index 1c8281c..4ea5f3c 100644
--- a/compose/foundation/foundation/api/restricted_current.txt
+++ b/compose/foundation/foundation/api/restricted_current.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.foundation {
 
-  public final class ActualJvmKt {
-  }
-
-  public final class AndroidOverscrollKt {
-  }
-
   public final class BackgroundKt {
     method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, long color, optional androidx.compose.ui.graphics.Shape shape);
     method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shape shape, optional float alpha);
@@ -47,9 +41,6 @@
     method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
   }
 
-  public final class Clickable_androidKt {
-  }
-
   public final class ClipScrollableContainerKt {
     method public static androidx.compose.ui.Modifier clipScrollableContainer(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.Orientation orientation);
   }
@@ -58,9 +49,6 @@
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean isSystemInDarkTheme();
   }
 
-  public final class DarkTheme_androidKt {
-  }
-
   public final class ExcludeFromSystemGesture_androidKt {
     method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier);
     method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
@@ -161,19 +149,10 @@
     method public static androidx.compose.ui.Modifier systemGestureExclusion(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
   }
 
-  public final class TempListUtilsKt {
-  }
-
 }
 
 package androidx.compose.foundation.gestures {
 
-  public final class AndroidScrollable_androidKt {
-  }
-
-  public final class ContentInViewModifierKt {
-  }
-
   public final class DragGestureDetectorKt {
     method public static suspend Object? awaitDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
     method public static suspend Object? awaitHorizontalDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
@@ -425,18 +404,8 @@
 
 }
 
-package androidx.compose.foundation.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.foundation.lazy {
 
-  public final class LazyBeyondBoundsModifierKt {
-  }
-
   public final class LazyDslKt {
     method @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,? extends kotlin.Unit> content);
@@ -458,9 +427,6 @@
     method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
   }
 
-  public final class LazyListHeadersKt {
-  }
-
   public interface LazyListItemInfo {
     method public int getIndex();
     method public Object getKey();
@@ -472,15 +438,6 @@
     property public abstract int size;
   }
 
-  public final class LazyListItemPlacementAnimatorKt {
-  }
-
-  public final class LazyListItemProviderKt {
-  }
-
-  public final class LazyListKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyListLayoutInfo {
     method public default int getAfterContentPadding();
     method public default int getBeforeContentPadding();
@@ -504,9 +461,6 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyListMeasureKt {
-  }
-
   @androidx.compose.foundation.lazy.LazyScopeMarker @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyListScope {
     method public default void item(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
     method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,? extends kotlin.Unit> content);
@@ -547,9 +501,6 @@
   @kotlin.DslMarker public @interface LazyScopeMarker {
   }
 
-  public final class LazySemanticsKt {
-  }
-
 }
 
 package androidx.compose.foundation.lazy.grid {
@@ -604,12 +555,6 @@
     field public static final int UnknownRow = -1; // 0xffffffff
   }
 
-  public final class LazyGridItemPlacementAnimatorKt {
-  }
-
-  public final class LazyGridItemProviderKt {
-  }
-
   @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker @androidx.compose.runtime.Stable public sealed interface LazyGridItemScope {
   }
 
@@ -620,9 +565,6 @@
     property public abstract int maxLineSpan;
   }
 
-  public final class LazyGridKt {
-  }
-
   public sealed interface LazyGridLayoutInfo {
     method public int getAfterContentPadding();
     method public int getBeforeContentPadding();
@@ -646,9 +588,6 @@
     property public abstract java.util.List<androidx.compose.foundation.lazy.grid.LazyGridItemInfo> visibleItemsInfo;
   }
 
-  public final class LazyGridMeasureKt {
-  }
-
   @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridScope {
     method public void item(optional Object? key, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,kotlin.Unit> content);
     method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
@@ -691,19 +630,10 @@
     method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.grid.LazyGridState rememberLazyGridState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
   }
 
-  public final class LazySemanticsKt {
-  }
-
 }
 
 package androidx.compose.foundation.lazy.layout {
 
-  public final class IntervalListKt {
-  }
-
-  public final class LazyAnimateScrollKt {
-  }
-
   public final class LazyLayoutItemProviderKt {
   }
 
@@ -713,18 +643,9 @@
   public final class LazyLayoutPinnableItemKt {
   }
 
-  public final class LazyLayoutPrefetcher_androidKt {
-  }
-
-  public final class LazyLayoutSemanticsKt {
-  }
-
   public final class LazyNearestItemsRangeKt {
   }
 
-  public final class LazySaveableStateHolderKt {
-  }
-
   public final class Lazy_androidKt {
   }
 
@@ -732,30 +653,9 @@
 
 package androidx.compose.foundation.lazy.staggeredgrid {
 
-  public final class LazyStaggeredGridCellsKt {
-  }
-
   public final class LazyStaggeredGridDslKt {
   }
 
-  public final class LazyStaggeredGridItemProviderKt {
-  }
-
-  public final class LazyStaggeredGridKt {
-  }
-
-  public final class LazyStaggeredGridMeasureKt {
-  }
-
-  public final class LazyStaggeredGridMeasurePolicyKt {
-  }
-
-  public final class LazyStaggeredGridMeasureResultKt {
-  }
-
-  public final class LazyStaggeredGridSemanticsKt {
-  }
-
   public final class LazyStaggeredGridStateKt {
   }
 
@@ -773,18 +673,12 @@
 
 package androidx.compose.foundation.relocation {
 
-  public final class BringIntoViewKt {
-  }
-
   public final class BringIntoViewRequesterKt {
   }
 
   public final class BringIntoViewResponderKt {
   }
 
-  public final class BringIntoViewResponder_androidKt {
-  }
-
 }
 
 package androidx.compose.foundation.selection {
@@ -912,9 +806,6 @@
 
 package androidx.compose.foundation.text {
 
-  public final class AndroidCursorHandle_androidKt {
-  }
-
   public final class BasicTextFieldKt {
     method @androidx.compose.runtime.Composable public static void BasicTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
     method @androidx.compose.runtime.Composable public static void BasicTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
@@ -933,18 +824,6 @@
     method @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional int overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
   }
 
-  public final class ContextMenu_androidKt {
-  }
-
-  public final class CoreTextFieldKt {
-  }
-
-  public final class CoreTextKt {
-  }
-
-  public final class HeightInLinesModifierKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class InlineTextContent {
     ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
     method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
@@ -957,15 +836,6 @@
     method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, optional String alternateText);
   }
 
-  public final class KeyEventHelpers_androidKt {
-  }
-
-  public final class KeyMappingKt {
-  }
-
-  public final class KeyMapping_androidKt {
-  }
-
   public interface KeyboardActionScope {
     method public void defaultKeyboardAction(int imeAction);
   }
@@ -1015,117 +885,15 @@
     property public final androidx.compose.foundation.text.KeyboardOptions Default;
   }
 
-  public final class LongPressTextDragObserverKt {
-  }
-
-  public final class PointerMoveDetectorKt {
-  }
-
-  public final class StringHelpersKt {
-  }
-
-  public final class StringHelpers_androidKt {
-  }
-
-  public final class StringHelpers_jvmKt {
-  }
-
-  public final class TextDelegateKt {
-  }
-
-  public final class TextFieldCursorKt {
-  }
-
-  public final class TextFieldDelegateKt {
-  }
-
-  public final class TextFieldFocusModifier_androidKt {
-  }
-
-  public final class TextFieldGestureModifiersKt {
-  }
-
-  public final class TextFieldKeyInputKt {
-  }
-
-  public final class TextFieldKeyInput_androidKt {
-  }
-
-  public final class TextFieldPressGestureFilterKt {
-  }
-
-  public final class TextFieldScrollKt {
-  }
-
-  public final class TextFieldSizeKt {
-  }
-
-  public final class TextLayoutHelperKt {
-  }
-
-  public final class TextLayoutResultProxyKt {
-  }
-
-  public final class TextPointerIcon_androidKt {
-  }
-
-  public final class TouchMode_androidKt {
-  }
-
-  public final class UndoManagerKt {
-  }
-
-  public final class UndoManager_jvmKt {
-  }
-
-  public final class ValidatingOffsetMappingKt {
-  }
-
 }
 
 package androidx.compose.foundation.text.selection {
 
-  public final class AndroidSelectionHandles_androidKt {
-  }
-
-  public final class MultiWidgetSelectionDelegateKt {
-  }
-
-  public final class SelectionAdjustmentKt {
-  }
-
   public final class SelectionContainerKt {
     method @androidx.compose.runtime.Composable public static void DisableSelection(kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void SelectionContainer(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class SelectionHandlesKt {
-  }
-
-  public final class SelectionMagnifierKt {
-  }
-
-  public final class SelectionManagerKt {
-  }
-
-  public final class SelectionManager_androidKt {
-  }
-
-  public final class SelectionRegistrarKt {
-  }
-
-  public final class SimpleLayoutKt {
-  }
-
-  public final class TextFieldSelectionDelegateKt {
-  }
-
-  public final class TextFieldSelectionManagerKt {
-  }
-
-  public final class TextFieldSelectionManager_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class TextSelectionColors {
     ctor public TextSelectionColors(long handleColor, long backgroundColor);
     method public long getBackgroundColor();
@@ -1139,11 +907,5 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> LocalTextSelectionColors;
   }
 
-  public final class TextSelectionDelegateKt {
-  }
-
-  public final class TextSelectionMouseDetectorKt {
-  }
-
 }
 
diff --git a/compose/material/material-ripple/api/1.4.0-beta01.txt b/compose/material/material-ripple/api/1.4.0-beta01.txt
index 32f4093..6dba36f 100644
--- a/compose/material/material-ripple/api/1.4.0-beta01.txt
+++ b/compose/material/material-ripple/api/1.4.0-beta01.txt
@@ -13,9 +13,6 @@
     property public final float pressedAlpha;
   }
 
-  public final class RippleAnimationKt {
-  }
-
   public final class RippleKt {
     method @androidx.compose.runtime.Composable public static androidx.compose.foundation.Indication rememberRipple(optional boolean bounded, optional float radius, optional long color);
   }
diff --git a/compose/material/material-ripple/api/current.ignore b/compose/material/material-ripple/api/current.ignore
new file mode 100644
index 0000000..ae07b75
--- /dev/null
+++ b/compose/material/material-ripple/api/current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.material.ripple.RippleAnimationKt:
+    Removed class androidx.compose.material.ripple.RippleAnimationKt
diff --git a/compose/material/material-ripple/api/current.txt b/compose/material/material-ripple/api/current.txt
index 32f4093..6dba36f 100644
--- a/compose/material/material-ripple/api/current.txt
+++ b/compose/material/material-ripple/api/current.txt
@@ -13,9 +13,6 @@
     property public final float pressedAlpha;
   }
 
-  public final class RippleAnimationKt {
-  }
-
   public final class RippleKt {
     method @androidx.compose.runtime.Composable public static androidx.compose.foundation.Indication rememberRipple(optional boolean bounded, optional float radius, optional long color);
   }
diff --git a/compose/material/material-ripple/api/public_plus_experimental_1.4.0-beta01.txt b/compose/material/material-ripple/api/public_plus_experimental_1.4.0-beta01.txt
index 32f4093..6dba36f 100644
--- a/compose/material/material-ripple/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/material/material-ripple/api/public_plus_experimental_1.4.0-beta01.txt
@@ -13,9 +13,6 @@
     property public final float pressedAlpha;
   }
 
-  public final class RippleAnimationKt {
-  }
-
   public final class RippleKt {
     method @androidx.compose.runtime.Composable public static androidx.compose.foundation.Indication rememberRipple(optional boolean bounded, optional float radius, optional long color);
   }
diff --git a/compose/material/material-ripple/api/public_plus_experimental_current.txt b/compose/material/material-ripple/api/public_plus_experimental_current.txt
index 32f4093..6dba36f 100644
--- a/compose/material/material-ripple/api/public_plus_experimental_current.txt
+++ b/compose/material/material-ripple/api/public_plus_experimental_current.txt
@@ -13,9 +13,6 @@
     property public final float pressedAlpha;
   }
 
-  public final class RippleAnimationKt {
-  }
-
   public final class RippleKt {
     method @androidx.compose.runtime.Composable public static androidx.compose.foundation.Indication rememberRipple(optional boolean bounded, optional float radius, optional long color);
   }
diff --git a/compose/material/material-ripple/api/restricted_1.4.0-beta01.txt b/compose/material/material-ripple/api/restricted_1.4.0-beta01.txt
index 32f4093..6dba36f 100644
--- a/compose/material/material-ripple/api/restricted_1.4.0-beta01.txt
+++ b/compose/material/material-ripple/api/restricted_1.4.0-beta01.txt
@@ -13,9 +13,6 @@
     property public final float pressedAlpha;
   }
 
-  public final class RippleAnimationKt {
-  }
-
   public final class RippleKt {
     method @androidx.compose.runtime.Composable public static androidx.compose.foundation.Indication rememberRipple(optional boolean bounded, optional float radius, optional long color);
   }
diff --git a/compose/material/material-ripple/api/restricted_current.ignore b/compose/material/material-ripple/api/restricted_current.ignore
new file mode 100644
index 0000000..ae07b75
--- /dev/null
+++ b/compose/material/material-ripple/api/restricted_current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.material.ripple.RippleAnimationKt:
+    Removed class androidx.compose.material.ripple.RippleAnimationKt
diff --git a/compose/material/material-ripple/api/restricted_current.txt b/compose/material/material-ripple/api/restricted_current.txt
index 32f4093..6dba36f 100644
--- a/compose/material/material-ripple/api/restricted_current.txt
+++ b/compose/material/material-ripple/api/restricted_current.txt
@@ -13,9 +13,6 @@
     property public final float pressedAlpha;
   }
 
-  public final class RippleAnimationKt {
-  }
-
   public final class RippleKt {
     method @androidx.compose.runtime.Composable public static androidx.compose.foundation.Indication rememberRipple(optional boolean bounded, optional float radius, optional long color);
   }
diff --git a/compose/material/material/api/1.4.0-beta01.txt b/compose/material/material/api/1.4.0-beta01.txt
index 10fa729..477a180 100644
--- a/compose/material/material/api/1.4.0-beta01.txt
+++ b/compose/material/material/api/1.4.0-beta01.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.material {
 
-  public final class AlertDialogKt {
-  }
-
   public final class AndroidAlertDialog_androidKt {
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
@@ -216,9 +213,6 @@
     method @androidx.compose.runtime.Composable public static void Divider(optional androidx.compose.ui.Modifier modifier, optional long color, optional float thickness, optional float startIndent);
   }
 
-  public final class DragGestureDetectorCopyKt {
-  }
-
   public final class DrawerDefaults {
     method public float getElevation();
     method @androidx.compose.runtime.Composable public long getScrimColor();
@@ -260,9 +254,6 @@
     enum_constant public static final androidx.compose.material.DrawerValue Open;
   }
 
-  public final class ElevationKt {
-  }
-
   public interface ElevationOverlay {
     method @androidx.compose.runtime.Composable public long apply(long color, float elevation);
   }
@@ -321,9 +312,6 @@
   public final class ListItemKt {
   }
 
-  public final class MaterialTextSelectionColorsKt {
-  }
-
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Colors getColors();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Shapes getShapes();
@@ -338,18 +326,12 @@
     method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.compose.material.Colors colors, optional androidx.compose.material.Typography typography, optional androidx.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class MaterialTheme_androidKt {
-  }
-
   public final class MenuDefaults {
     method public androidx.compose.foundation.layout.PaddingValues getDropdownMenuItemContentPadding();
     property public final androidx.compose.foundation.layout.PaddingValues DropdownMenuItemContentPadding;
     field public static final androidx.compose.material.MenuDefaults INSTANCE;
   }
 
-  public final class MenuKt {
-  }
-
   public final class ModalBottomSheetDefaults {
     method public float getElevation();
     method @androidx.compose.runtime.Composable public long getScrimColor();
@@ -447,9 +429,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   @androidx.compose.runtime.Stable public interface SliderColors {
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled);
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> tickColor(boolean enabled, boolean active);
@@ -520,9 +499,6 @@
     enum_constant public static final androidx.compose.material.SnackbarResult Dismissed;
   }
 
-  public final class Strings_androidKt {
-  }
-
   public final class SurfaceKt {
     method @androidx.compose.runtime.Composable public static void Surface(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
@@ -544,9 +520,6 @@
   public final class SwipeableKt {
   }
 
-  public final class SwipeableV2Kt {
-  }
-
   @androidx.compose.runtime.Stable public interface SwitchColors {
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled, boolean checked);
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean checked);
@@ -627,12 +600,6 @@
     field public static final float UnfocusedIndicatorLineOpacity = 0.42f;
   }
 
-  public final class TextFieldDefaultsKt {
-  }
-
-  public final class TextFieldImplKt {
-  }
-
   public final class TextFieldKt {
     method @androidx.compose.runtime.Composable public static void TextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
     method @androidx.compose.runtime.Composable public static void TextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
@@ -681,16 +648,6 @@
     property public final androidx.compose.ui.text.TextStyle subtitle2;
   }
 
-  public final class TypographyKt {
-  }
-
-}
-
-package androidx.compose.material.internal {
-
-  public final class ExposedDropdownMenuPopupKt {
-  }
-
 }
 
 package androidx.compose.material.pullrefresh {
diff --git a/compose/material/material/api/current.ignore b/compose/material/material/api/current.ignore
index 2bb29aa..11096af 100644
--- a/compose/material/material/api/current.ignore
+++ b/compose/material/material/api/current.ignore
@@ -1,3 +1,31 @@
 // Baseline format: 1.0
+RemovedClass: androidx.compose.material.AlertDialogKt:
+    Removed class androidx.compose.material.AlertDialogKt
+RemovedClass: androidx.compose.material.DragGestureDetectorCopyKt:
+    Removed class androidx.compose.material.DragGestureDetectorCopyKt
+RemovedClass: androidx.compose.material.ElevationKt:
+    Removed class androidx.compose.material.ElevationKt
+RemovedClass: androidx.compose.material.MaterialTextSelectionColorsKt:
+    Removed class androidx.compose.material.MaterialTextSelectionColorsKt
+RemovedClass: androidx.compose.material.MaterialTheme_androidKt:
+    Removed class androidx.compose.material.MaterialTheme_androidKt
+RemovedClass: androidx.compose.material.MenuKt:
+    Removed class androidx.compose.material.MenuKt
+RemovedClass: androidx.compose.material.ShapesKt:
+    Removed class androidx.compose.material.ShapesKt
+RemovedClass: androidx.compose.material.Strings_androidKt:
+    Removed class androidx.compose.material.Strings_androidKt
+RemovedClass: androidx.compose.material.SwipeableV2Kt:
+    Removed class androidx.compose.material.SwipeableV2Kt
+RemovedClass: androidx.compose.material.TextFieldDefaultsKt:
+    Removed class androidx.compose.material.TextFieldDefaultsKt
+RemovedClass: androidx.compose.material.TextFieldImplKt:
+    Removed class androidx.compose.material.TextFieldImplKt
 RemovedClass: androidx.compose.material.TouchTargetKt:
     Removed class androidx.compose.material.TouchTargetKt
+RemovedClass: androidx.compose.material.TypographyKt:
+    Removed class androidx.compose.material.TypographyKt
+
+
+RemovedPackage: androidx.compose.material.internal:
+    Removed package androidx.compose.material.internal
diff --git a/compose/material/material/api/current.txt b/compose/material/material/api/current.txt
index 10fa729..477a180 100644
--- a/compose/material/material/api/current.txt
+++ b/compose/material/material/api/current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.material {
 
-  public final class AlertDialogKt {
-  }
-
   public final class AndroidAlertDialog_androidKt {
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
@@ -216,9 +213,6 @@
     method @androidx.compose.runtime.Composable public static void Divider(optional androidx.compose.ui.Modifier modifier, optional long color, optional float thickness, optional float startIndent);
   }
 
-  public final class DragGestureDetectorCopyKt {
-  }
-
   public final class DrawerDefaults {
     method public float getElevation();
     method @androidx.compose.runtime.Composable public long getScrimColor();
@@ -260,9 +254,6 @@
     enum_constant public static final androidx.compose.material.DrawerValue Open;
   }
 
-  public final class ElevationKt {
-  }
-
   public interface ElevationOverlay {
     method @androidx.compose.runtime.Composable public long apply(long color, float elevation);
   }
@@ -321,9 +312,6 @@
   public final class ListItemKt {
   }
 
-  public final class MaterialTextSelectionColorsKt {
-  }
-
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Colors getColors();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Shapes getShapes();
@@ -338,18 +326,12 @@
     method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.compose.material.Colors colors, optional androidx.compose.material.Typography typography, optional androidx.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class MaterialTheme_androidKt {
-  }
-
   public final class MenuDefaults {
     method public androidx.compose.foundation.layout.PaddingValues getDropdownMenuItemContentPadding();
     property public final androidx.compose.foundation.layout.PaddingValues DropdownMenuItemContentPadding;
     field public static final androidx.compose.material.MenuDefaults INSTANCE;
   }
 
-  public final class MenuKt {
-  }
-
   public final class ModalBottomSheetDefaults {
     method public float getElevation();
     method @androidx.compose.runtime.Composable public long getScrimColor();
@@ -447,9 +429,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   @androidx.compose.runtime.Stable public interface SliderColors {
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled);
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> tickColor(boolean enabled, boolean active);
@@ -520,9 +499,6 @@
     enum_constant public static final androidx.compose.material.SnackbarResult Dismissed;
   }
 
-  public final class Strings_androidKt {
-  }
-
   public final class SurfaceKt {
     method @androidx.compose.runtime.Composable public static void Surface(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
@@ -544,9 +520,6 @@
   public final class SwipeableKt {
   }
 
-  public final class SwipeableV2Kt {
-  }
-
   @androidx.compose.runtime.Stable public interface SwitchColors {
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled, boolean checked);
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean checked);
@@ -627,12 +600,6 @@
     field public static final float UnfocusedIndicatorLineOpacity = 0.42f;
   }
 
-  public final class TextFieldDefaultsKt {
-  }
-
-  public final class TextFieldImplKt {
-  }
-
   public final class TextFieldKt {
     method @androidx.compose.runtime.Composable public static void TextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
     method @androidx.compose.runtime.Composable public static void TextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
@@ -681,16 +648,6 @@
     property public final androidx.compose.ui.text.TextStyle subtitle2;
   }
 
-  public final class TypographyKt {
-  }
-
-}
-
-package androidx.compose.material.internal {
-
-  public final class ExposedDropdownMenuPopupKt {
-  }
-
 }
 
 package androidx.compose.material.pullrefresh {
diff --git a/compose/material/material/api/public_plus_experimental_1.4.0-beta01.txt b/compose/material/material/api/public_plus_experimental_1.4.0-beta01.txt
index 5423532..9ae0deb 100644
--- a/compose/material/material/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/material/material/api/public_plus_experimental_1.4.0-beta01.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.material {
 
-  public final class AlertDialogKt {
-  }
-
   public final class AndroidAlertDialog_androidKt {
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
@@ -356,9 +353,6 @@
     method @androidx.compose.runtime.Composable public static void Divider(optional androidx.compose.ui.Modifier modifier, optional long color, optional float thickness, optional float startIndent);
   }
 
-  public final class DragGestureDetectorCopyKt {
-  }
-
   public final class DrawerDefaults {
     method public float getElevation();
     method @androidx.compose.runtime.Composable public long getScrimColor();
@@ -407,9 +401,6 @@
     enum_constant public static final androidx.compose.material.DrawerValue Open;
   }
 
-  public final class ElevationKt {
-  }
-
   public interface ElevationOverlay {
     method @androidx.compose.runtime.Composable public long apply(long color, float elevation);
   }
@@ -501,9 +492,6 @@
     method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void ListItem(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? secondaryText, optional boolean singleLineSecondaryText, optional kotlin.jvm.functions.Function0<kotlin.Unit>? overlineText, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailing, kotlin.jvm.functions.Function0<kotlin.Unit> text);
   }
 
-  public final class MaterialTextSelectionColorsKt {
-  }
-
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Colors getColors();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Shapes getShapes();
@@ -518,18 +506,12 @@
     method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.compose.material.Colors colors, optional androidx.compose.material.Typography typography, optional androidx.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class MaterialTheme_androidKt {
-  }
-
   public final class MenuDefaults {
     method public androidx.compose.foundation.layout.PaddingValues getDropdownMenuItemContentPadding();
     property public final androidx.compose.foundation.layout.PaddingValues DropdownMenuItemContentPadding;
     field public static final androidx.compose.material.MenuDefaults INSTANCE;
   }
 
-  public final class MenuKt {
-  }
-
   public final class ModalBottomSheetDefaults {
     method public float getElevation();
     method @androidx.compose.runtime.Composable public long getScrimColor();
@@ -665,9 +647,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   @androidx.compose.runtime.Stable public interface SliderColors {
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled);
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> tickColor(boolean enabled, boolean active);
@@ -739,9 +718,6 @@
     enum_constant public static final androidx.compose.material.SnackbarResult Dismissed;
   }
 
-  public final class Strings_androidKt {
-  }
-
   public final class SurfaceKt {
     method @androidx.compose.runtime.Composable public static void Surface(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void Surface(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
@@ -808,9 +784,6 @@
     method public <T> androidx.compose.runtime.saveable.Saver<androidx.compose.material.SwipeableState<T>,T> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmStateChange);
   }
 
-  public final class SwipeableV2Kt {
-  }
-
   @androidx.compose.runtime.Stable public interface SwitchColors {
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled, boolean checked);
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean checked);
@@ -903,12 +876,6 @@
     field public static final float UnfocusedIndicatorLineOpacity = 0.42f;
   }
 
-  public final class TextFieldDefaultsKt {
-  }
-
-  public final class TextFieldImplKt {
-  }
-
   public final class TextFieldKt {
     method @androidx.compose.runtime.Composable public static void TextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
     method @androidx.compose.runtime.Composable public static void TextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
@@ -961,16 +928,6 @@
     property public final androidx.compose.ui.text.TextStyle subtitle2;
   }
 
-  public final class TypographyKt {
-  }
-
-}
-
-package androidx.compose.material.internal {
-
-  public final class ExposedDropdownMenuPopupKt {
-  }
-
 }
 
 package androidx.compose.material.pullrefresh {
diff --git a/compose/material/material/api/public_plus_experimental_current.txt b/compose/material/material/api/public_plus_experimental_current.txt
index 5423532..9ae0deb 100644
--- a/compose/material/material/api/public_plus_experimental_current.txt
+++ b/compose/material/material/api/public_plus_experimental_current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.material {
 
-  public final class AlertDialogKt {
-  }
-
   public final class AndroidAlertDialog_androidKt {
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
@@ -356,9 +353,6 @@
     method @androidx.compose.runtime.Composable public static void Divider(optional androidx.compose.ui.Modifier modifier, optional long color, optional float thickness, optional float startIndent);
   }
 
-  public final class DragGestureDetectorCopyKt {
-  }
-
   public final class DrawerDefaults {
     method public float getElevation();
     method @androidx.compose.runtime.Composable public long getScrimColor();
@@ -407,9 +401,6 @@
     enum_constant public static final androidx.compose.material.DrawerValue Open;
   }
 
-  public final class ElevationKt {
-  }
-
   public interface ElevationOverlay {
     method @androidx.compose.runtime.Composable public long apply(long color, float elevation);
   }
@@ -501,9 +492,6 @@
     method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void ListItem(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? secondaryText, optional boolean singleLineSecondaryText, optional kotlin.jvm.functions.Function0<kotlin.Unit>? overlineText, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailing, kotlin.jvm.functions.Function0<kotlin.Unit> text);
   }
 
-  public final class MaterialTextSelectionColorsKt {
-  }
-
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Colors getColors();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Shapes getShapes();
@@ -518,18 +506,12 @@
     method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.compose.material.Colors colors, optional androidx.compose.material.Typography typography, optional androidx.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class MaterialTheme_androidKt {
-  }
-
   public final class MenuDefaults {
     method public androidx.compose.foundation.layout.PaddingValues getDropdownMenuItemContentPadding();
     property public final androidx.compose.foundation.layout.PaddingValues DropdownMenuItemContentPadding;
     field public static final androidx.compose.material.MenuDefaults INSTANCE;
   }
 
-  public final class MenuKt {
-  }
-
   public final class ModalBottomSheetDefaults {
     method public float getElevation();
     method @androidx.compose.runtime.Composable public long getScrimColor();
@@ -665,9 +647,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   @androidx.compose.runtime.Stable public interface SliderColors {
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled);
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> tickColor(boolean enabled, boolean active);
@@ -739,9 +718,6 @@
     enum_constant public static final androidx.compose.material.SnackbarResult Dismissed;
   }
 
-  public final class Strings_androidKt {
-  }
-
   public final class SurfaceKt {
     method @androidx.compose.runtime.Composable public static void Surface(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void Surface(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
@@ -808,9 +784,6 @@
     method public <T> androidx.compose.runtime.saveable.Saver<androidx.compose.material.SwipeableState<T>,T> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmStateChange);
   }
 
-  public final class SwipeableV2Kt {
-  }
-
   @androidx.compose.runtime.Stable public interface SwitchColors {
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled, boolean checked);
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean checked);
@@ -903,12 +876,6 @@
     field public static final float UnfocusedIndicatorLineOpacity = 0.42f;
   }
 
-  public final class TextFieldDefaultsKt {
-  }
-
-  public final class TextFieldImplKt {
-  }
-
   public final class TextFieldKt {
     method @androidx.compose.runtime.Composable public static void TextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
     method @androidx.compose.runtime.Composable public static void TextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
@@ -961,16 +928,6 @@
     property public final androidx.compose.ui.text.TextStyle subtitle2;
   }
 
-  public final class TypographyKt {
-  }
-
-}
-
-package androidx.compose.material.internal {
-
-  public final class ExposedDropdownMenuPopupKt {
-  }
-
 }
 
 package androidx.compose.material.pullrefresh {
diff --git a/compose/material/material/api/restricted_1.4.0-beta01.txt b/compose/material/material/api/restricted_1.4.0-beta01.txt
index 10fa729..477a180 100644
--- a/compose/material/material/api/restricted_1.4.0-beta01.txt
+++ b/compose/material/material/api/restricted_1.4.0-beta01.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.material {
 
-  public final class AlertDialogKt {
-  }
-
   public final class AndroidAlertDialog_androidKt {
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
@@ -216,9 +213,6 @@
     method @androidx.compose.runtime.Composable public static void Divider(optional androidx.compose.ui.Modifier modifier, optional long color, optional float thickness, optional float startIndent);
   }
 
-  public final class DragGestureDetectorCopyKt {
-  }
-
   public final class DrawerDefaults {
     method public float getElevation();
     method @androidx.compose.runtime.Composable public long getScrimColor();
@@ -260,9 +254,6 @@
     enum_constant public static final androidx.compose.material.DrawerValue Open;
   }
 
-  public final class ElevationKt {
-  }
-
   public interface ElevationOverlay {
     method @androidx.compose.runtime.Composable public long apply(long color, float elevation);
   }
@@ -321,9 +312,6 @@
   public final class ListItemKt {
   }
 
-  public final class MaterialTextSelectionColorsKt {
-  }
-
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Colors getColors();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Shapes getShapes();
@@ -338,18 +326,12 @@
     method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.compose.material.Colors colors, optional androidx.compose.material.Typography typography, optional androidx.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class MaterialTheme_androidKt {
-  }
-
   public final class MenuDefaults {
     method public androidx.compose.foundation.layout.PaddingValues getDropdownMenuItemContentPadding();
     property public final androidx.compose.foundation.layout.PaddingValues DropdownMenuItemContentPadding;
     field public static final androidx.compose.material.MenuDefaults INSTANCE;
   }
 
-  public final class MenuKt {
-  }
-
   public final class ModalBottomSheetDefaults {
     method public float getElevation();
     method @androidx.compose.runtime.Composable public long getScrimColor();
@@ -447,9 +429,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   @androidx.compose.runtime.Stable public interface SliderColors {
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled);
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> tickColor(boolean enabled, boolean active);
@@ -520,9 +499,6 @@
     enum_constant public static final androidx.compose.material.SnackbarResult Dismissed;
   }
 
-  public final class Strings_androidKt {
-  }
-
   public final class SurfaceKt {
     method @androidx.compose.runtime.Composable public static void Surface(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
@@ -544,9 +520,6 @@
   public final class SwipeableKt {
   }
 
-  public final class SwipeableV2Kt {
-  }
-
   @androidx.compose.runtime.Stable public interface SwitchColors {
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled, boolean checked);
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean checked);
@@ -627,12 +600,6 @@
     field public static final float UnfocusedIndicatorLineOpacity = 0.42f;
   }
 
-  public final class TextFieldDefaultsKt {
-  }
-
-  public final class TextFieldImplKt {
-  }
-
   public final class TextFieldKt {
     method @androidx.compose.runtime.Composable public static void TextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
     method @androidx.compose.runtime.Composable public static void TextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
@@ -681,16 +648,6 @@
     property public final androidx.compose.ui.text.TextStyle subtitle2;
   }
 
-  public final class TypographyKt {
-  }
-
-}
-
-package androidx.compose.material.internal {
-
-  public final class ExposedDropdownMenuPopupKt {
-  }
-
 }
 
 package androidx.compose.material.pullrefresh {
diff --git a/compose/material/material/api/restricted_current.ignore b/compose/material/material/api/restricted_current.ignore
index 2bb29aa..11096af 100644
--- a/compose/material/material/api/restricted_current.ignore
+++ b/compose/material/material/api/restricted_current.ignore
@@ -1,3 +1,31 @@
 // Baseline format: 1.0
+RemovedClass: androidx.compose.material.AlertDialogKt:
+    Removed class androidx.compose.material.AlertDialogKt
+RemovedClass: androidx.compose.material.DragGestureDetectorCopyKt:
+    Removed class androidx.compose.material.DragGestureDetectorCopyKt
+RemovedClass: androidx.compose.material.ElevationKt:
+    Removed class androidx.compose.material.ElevationKt
+RemovedClass: androidx.compose.material.MaterialTextSelectionColorsKt:
+    Removed class androidx.compose.material.MaterialTextSelectionColorsKt
+RemovedClass: androidx.compose.material.MaterialTheme_androidKt:
+    Removed class androidx.compose.material.MaterialTheme_androidKt
+RemovedClass: androidx.compose.material.MenuKt:
+    Removed class androidx.compose.material.MenuKt
+RemovedClass: androidx.compose.material.ShapesKt:
+    Removed class androidx.compose.material.ShapesKt
+RemovedClass: androidx.compose.material.Strings_androidKt:
+    Removed class androidx.compose.material.Strings_androidKt
+RemovedClass: androidx.compose.material.SwipeableV2Kt:
+    Removed class androidx.compose.material.SwipeableV2Kt
+RemovedClass: androidx.compose.material.TextFieldDefaultsKt:
+    Removed class androidx.compose.material.TextFieldDefaultsKt
+RemovedClass: androidx.compose.material.TextFieldImplKt:
+    Removed class androidx.compose.material.TextFieldImplKt
 RemovedClass: androidx.compose.material.TouchTargetKt:
     Removed class androidx.compose.material.TouchTargetKt
+RemovedClass: androidx.compose.material.TypographyKt:
+    Removed class androidx.compose.material.TypographyKt
+
+
+RemovedPackage: androidx.compose.material.internal:
+    Removed package androidx.compose.material.internal
diff --git a/compose/material/material/api/restricted_current.txt b/compose/material/material/api/restricted_current.txt
index 10fa729..477a180 100644
--- a/compose/material/material/api/restricted_current.txt
+++ b/compose/material/material/api/restricted_current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.material {
 
-  public final class AlertDialogKt {
-  }
-
   public final class AndroidAlertDialog_androidKt {
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
@@ -216,9 +213,6 @@
     method @androidx.compose.runtime.Composable public static void Divider(optional androidx.compose.ui.Modifier modifier, optional long color, optional float thickness, optional float startIndent);
   }
 
-  public final class DragGestureDetectorCopyKt {
-  }
-
   public final class DrawerDefaults {
     method public float getElevation();
     method @androidx.compose.runtime.Composable public long getScrimColor();
@@ -260,9 +254,6 @@
     enum_constant public static final androidx.compose.material.DrawerValue Open;
   }
 
-  public final class ElevationKt {
-  }
-
   public interface ElevationOverlay {
     method @androidx.compose.runtime.Composable public long apply(long color, float elevation);
   }
@@ -321,9 +312,6 @@
   public final class ListItemKt {
   }
 
-  public final class MaterialTextSelectionColorsKt {
-  }
-
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Colors getColors();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Shapes getShapes();
@@ -338,18 +326,12 @@
     method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.compose.material.Colors colors, optional androidx.compose.material.Typography typography, optional androidx.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class MaterialTheme_androidKt {
-  }
-
   public final class MenuDefaults {
     method public androidx.compose.foundation.layout.PaddingValues getDropdownMenuItemContentPadding();
     property public final androidx.compose.foundation.layout.PaddingValues DropdownMenuItemContentPadding;
     field public static final androidx.compose.material.MenuDefaults INSTANCE;
   }
 
-  public final class MenuKt {
-  }
-
   public final class ModalBottomSheetDefaults {
     method public float getElevation();
     method @androidx.compose.runtime.Composable public long getScrimColor();
@@ -447,9 +429,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   @androidx.compose.runtime.Stable public interface SliderColors {
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled);
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> tickColor(boolean enabled, boolean active);
@@ -520,9 +499,6 @@
     enum_constant public static final androidx.compose.material.SnackbarResult Dismissed;
   }
 
-  public final class Strings_androidKt {
-  }
-
   public final class SurfaceKt {
     method @androidx.compose.runtime.Composable public static void Surface(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
@@ -544,9 +520,6 @@
   public final class SwipeableKt {
   }
 
-  public final class SwipeableV2Kt {
-  }
-
   @androidx.compose.runtime.Stable public interface SwitchColors {
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled, boolean checked);
     method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean checked);
@@ -627,12 +600,6 @@
     field public static final float UnfocusedIndicatorLineOpacity = 0.42f;
   }
 
-  public final class TextFieldDefaultsKt {
-  }
-
-  public final class TextFieldImplKt {
-  }
-
   public final class TextFieldKt {
     method @androidx.compose.runtime.Composable public static void TextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
     method @androidx.compose.runtime.Composable public static void TextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
@@ -681,16 +648,6 @@
     property public final androidx.compose.ui.text.TextStyle subtitle2;
   }
 
-  public final class TypographyKt {
-  }
-
-}
-
-package androidx.compose.material.internal {
-
-  public final class ExposedDropdownMenuPopupKt {
-  }
-
 }
 
 package androidx.compose.material.pullrefresh {
diff --git a/compose/material3/material3-window-size-class/api/current.ignore b/compose/material3/material3-window-size-class/api/current.ignore
new file mode 100644
index 0000000..470ece8
--- /dev/null
+++ b/compose/material3/material3-window-size-class/api/current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.material3.windowsizeclass.TestOnly_jvmKt:
+    Removed class androidx.compose.material3.windowsizeclass.TestOnly_jvmKt
diff --git a/compose/material3/material3-window-size-class/api/current.txt b/compose/material3/material3-window-size-class/api/current.txt
index 8522c90..10051db 100644
--- a/compose/material3/material3-window-size-class/api/current.txt
+++ b/compose/material3/material3-window-size-class/api/current.txt
@@ -4,9 +4,6 @@
   public final class AndroidWindowSizeClass_androidKt {
   }
 
-  public final class TestOnly_jvmKt {
-  }
-
   @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class WindowHeightSizeClass implements java.lang.Comparable<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> {
     method public operator int compareTo(int other);
     field public static final androidx.compose.material3.windowsizeclass.WindowHeightSizeClass.Companion Companion;
diff --git a/compose/material3/material3-window-size-class/api/public_plus_experimental_current.txt b/compose/material3/material3-window-size-class/api/public_plus_experimental_current.txt
index 81a9075..88ceafc 100644
--- a/compose/material3/material3-window-size-class/api/public_plus_experimental_current.txt
+++ b/compose/material3/material3-window-size-class/api/public_plus_experimental_current.txt
@@ -8,9 +8,6 @@
   @kotlin.RequiresOptIn(message="This material3-window-size-class API is experimental and is likely to change or to " + "be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalMaterial3WindowSizeClassApi {
   }
 
-  public final class TestOnly_jvmKt {
-  }
-
   @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class WindowHeightSizeClass implements java.lang.Comparable<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> {
     method public operator int compareTo(int other);
     field public static final androidx.compose.material3.windowsizeclass.WindowHeightSizeClass.Companion Companion;
diff --git a/compose/material3/material3-window-size-class/api/restricted_current.ignore b/compose/material3/material3-window-size-class/api/restricted_current.ignore
new file mode 100644
index 0000000..470ece8
--- /dev/null
+++ b/compose/material3/material3-window-size-class/api/restricted_current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.material3.windowsizeclass.TestOnly_jvmKt:
+    Removed class androidx.compose.material3.windowsizeclass.TestOnly_jvmKt
diff --git a/compose/material3/material3-window-size-class/api/restricted_current.txt b/compose/material3/material3-window-size-class/api/restricted_current.txt
index 8522c90..10051db 100644
--- a/compose/material3/material3-window-size-class/api/restricted_current.txt
+++ b/compose/material3/material3-window-size-class/api/restricted_current.txt
@@ -4,9 +4,6 @@
   public final class AndroidWindowSizeClass_androidKt {
   }
 
-  public final class TestOnly_jvmKt {
-  }
-
   @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class WindowHeightSizeClass implements java.lang.Comparable<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> {
     method public operator int compareTo(int other);
     field public static final androidx.compose.material3.windowsizeclass.WindowHeightSizeClass.Companion Companion;
diff --git a/compose/material3/material3/api/current.ignore b/compose/material3/material3/api/current.ignore
index 929472e..b29404c 100644
--- a/compose/material3/material3/api/current.ignore
+++ b/compose/material3/material3/api/current.ignore
@@ -1,3 +1,33 @@
 // Baseline format: 1.0
+RemovedClass: androidx.compose.material3.AlertDialogKt:
+    Removed class androidx.compose.material3.AlertDialogKt
+RemovedClass: androidx.compose.material3.DragGestureDetectorCopyKt:
+    Removed class androidx.compose.material3.DragGestureDetectorCopyKt
+RemovedClass: androidx.compose.material3.ElevationKt:
+    Removed class androidx.compose.material3.ElevationKt
+RemovedClass: androidx.compose.material3.IncludeFontPaddingHelper_androidKt:
+    Removed class androidx.compose.material3.IncludeFontPaddingHelper_androidKt
+RemovedClass: androidx.compose.material3.MenuKt:
+    Removed class androidx.compose.material3.MenuKt
+RemovedClass: androidx.compose.material3.ShapesKt:
+    Removed class androidx.compose.material3.ShapesKt
+RemovedClass: androidx.compose.material3.Strings_androidKt:
+    Removed class androidx.compose.material3.Strings_androidKt
+RemovedClass: androidx.compose.material3.SwipeableKt:
+    Removed class androidx.compose.material3.SwipeableKt
+RemovedClass: androidx.compose.material3.SystemBarsDefaultInsets_androidKt:
+    Removed class androidx.compose.material3.SystemBarsDefaultInsets_androidKt
+RemovedClass: androidx.compose.material3.TextFieldDefaultsKt:
+    Removed class androidx.compose.material3.TextFieldDefaultsKt
+RemovedClass: androidx.compose.material3.TextFieldImplKt:
+    Removed class androidx.compose.material3.TextFieldImplKt
+RemovedClass: androidx.compose.material3.TonalPaletteKt:
+    Removed class androidx.compose.material3.TonalPaletteKt
 RemovedClass: androidx.compose.material3.TouchTargetKt:
     Removed class androidx.compose.material3.TouchTargetKt
+RemovedClass: androidx.compose.material3.TypographyKt:
+    Removed class androidx.compose.material3.TypographyKt
+
+
+RemovedPackage: androidx.compose.material3.internal:
+    Removed package androidx.compose.material3.internal
diff --git a/compose/material3/material3/api/current.txt b/compose/material3/material3/api/current.txt
index 9033914..393c4e4 100644
--- a/compose/material3/material3/api/current.txt
+++ b/compose/material3/material3/api/current.txt
@@ -17,9 +17,6 @@
     field public static final androidx.compose.material3.AlertDialogDefaults INSTANCE;
   }
 
-  public final class AlertDialogKt {
-  }
-
   public final class AndroidAlertDialog_androidKt {
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long containerColor, optional long iconContentColor, optional long titleContentColor, optional long textContentColor, optional float tonalElevation, optional androidx.compose.ui.window.DialogProperties properties);
   }
@@ -120,12 +117,6 @@
     method @androidx.compose.runtime.Composable public static void TextButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material3.ButtonColors colors, optional androidx.compose.material3.ButtonElevation? elevation, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
   }
 
-  public final class CalendarModelKt {
-  }
-
-  public final class CalendarModel_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class CardColors {
   }
 
@@ -260,9 +251,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
   }
 
-  public final class DateInputKt {
-  }
-
   public final class DatePickerDialog_androidKt {
   }
 
@@ -284,9 +272,6 @@
     method @androidx.compose.runtime.Composable public static void Divider(optional androidx.compose.ui.Modifier modifier, optional float thickness, optional long color);
   }
 
-  public final class DragGestureDetectorCopyKt {
-  }
-
   public final class DrawerDefaults {
     method @androidx.compose.runtime.Composable public long getContainerColor();
     method public float getDismissibleDrawerElevation();
@@ -344,9 +329,6 @@
     method @RequiresApi(android.os.Build.VERSION_CODES.S) public static androidx.compose.material3.ColorScheme dynamicLightColorScheme(android.content.Context context);
   }
 
-  public final class ElevationKt {
-  }
-
   public final class ExposedDropdownMenuKt {
   }
 
@@ -432,9 +414,6 @@
   @androidx.compose.runtime.Immutable public final class IconToggleButtonColors {
   }
 
-  public final class IncludeFontPaddingHelper_androidKt {
-  }
-
   public final class InteractiveComponentSizeKt {
     method public static androidx.compose.ui.Modifier minimumInteractiveComponentSize(androidx.compose.ui.Modifier);
   }
@@ -483,9 +462,6 @@
   @androidx.compose.runtime.Immutable public final class MenuItemColors {
   }
 
-  public final class MenuKt {
-  }
-
   public final class ModalBottomSheetKt {
   }
 
@@ -666,9 +642,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   public final class SheetDefaultsKt {
   }
 
@@ -762,9 +735,6 @@
     property public abstract boolean withDismissAction;
   }
 
-  public final class Strings_androidKt {
-  }
-
   public final class SuggestionChipDefaults {
     method @androidx.compose.runtime.Composable public androidx.compose.material3.ChipColors elevatedSuggestionChipColors(optional long containerColor, optional long labelColor, optional long iconContentColor, optional long disabledContainerColor, optional long disabledLabelColor, optional long disabledIconContentColor);
     method @androidx.compose.runtime.Composable public androidx.compose.material3.ChipElevation elevatedSuggestionChipElevation(optional float defaultElevation, optional float pressedElevation, optional float focusedElevation, optional float hoveredElevation, optional float draggedElevation, optional float disabledElevation);
@@ -789,12 +759,6 @@
   public final class SwipeToDismissKt {
   }
 
-  public final class SwipeableKt {
-  }
-
-  public final class SwipeableV2Kt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SwitchColors {
   }
 
@@ -809,9 +773,6 @@
     method @androidx.compose.runtime.Composable public static void Switch(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? thumbContent, optional boolean enabled, optional androidx.compose.material3.SwitchColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
   }
 
-  public final class SystemBarsDefaultInsets_androidKt {
-  }
-
   public final class TabKt {
     method @androidx.compose.runtime.Composable public static void LeadingIconTab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional long selectedContentColor, optional long unselectedContentColor, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
     method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional long selectedContentColor, optional long unselectedContentColor, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
@@ -845,12 +806,6 @@
   @androidx.compose.runtime.Immutable public final class TextFieldColors {
   }
 
-  public final class TextFieldDefaultsKt {
-  }
-
-  public final class TextFieldImplKt {
-  }
-
   public final class TextFieldKt {
   }
 
@@ -864,9 +819,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
   }
 
-  public final class TimeFormat_androidKt {
-  }
-
   public final class TimePickerKt {
   }
 
@@ -886,9 +838,6 @@
     method public androidx.compose.runtime.saveable.Saver<androidx.compose.material3.TimePickerState,?> Saver();
   }
 
-  public final class TonalPaletteKt {
-  }
-
   public final class TooltipKt {
   }
 
@@ -927,15 +876,5 @@
     property public final androidx.compose.ui.text.TextStyle titleSmall;
   }
 
-  public final class TypographyKt {
-  }
-
-}
-
-package androidx.compose.material3.internal {
-
-  public final class ExposedDropdownMenuPopupKt {
-  }
-
 }
 
diff --git a/compose/material3/material3/api/public_plus_experimental_current.txt b/compose/material3/material3/api/public_plus_experimental_current.txt
index 4d2a169..e1b2628 100644
--- a/compose/material3/material3/api/public_plus_experimental_current.txt
+++ b/compose/material3/material3/api/public_plus_experimental_current.txt
@@ -17,9 +17,6 @@
     field public static final androidx.compose.material3.AlertDialogDefaults INSTANCE;
   }
 
-  public final class AlertDialogKt {
-  }
-
   public final class AndroidAlertDialog_androidKt {
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long containerColor, optional long iconContentColor, optional long titleContentColor, optional long textContentColor, optional float tonalElevation, optional androidx.compose.ui.window.DialogProperties properties);
     method @androidx.compose.material3.ExperimentalMaterial3Api @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
@@ -150,12 +147,6 @@
     method @androidx.compose.runtime.Composable public static void TextButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material3.ButtonColors colors, optional androidx.compose.material3.ButtonElevation? elevation, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
   }
 
-  public final class CalendarModelKt {
-  }
-
-  public final class CalendarModel_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class CardColors {
   }
 
@@ -296,9 +287,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
   }
 
-  public final class DateInputKt {
-  }
-
   @androidx.compose.material3.ExperimentalMaterial3Api @androidx.compose.runtime.Immutable public final class DatePickerColors {
   }
 
@@ -432,9 +420,6 @@
     method @androidx.compose.runtime.Composable public static void Divider(optional androidx.compose.ui.Modifier modifier, optional float thickness, optional long color);
   }
 
-  public final class DragGestureDetectorCopyKt {
-  }
-
   public final class DrawerDefaults {
     method @androidx.compose.runtime.Composable public long getContainerColor();
     method public float getDismissibleDrawerElevation();
@@ -492,9 +477,6 @@
     method @RequiresApi(android.os.Build.VERSION_CODES.S) public static androidx.compose.material3.ColorScheme dynamicLightColorScheme(android.content.Context context);
   }
 
-  public final class ElevationKt {
-  }
-
   @kotlin.RequiresOptIn(message="This material API is experimental and is likely to change or to be removed in" + " the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalMaterial3Api {
   }
 
@@ -616,9 +598,6 @@
   @androidx.compose.runtime.Immutable public final class IconToggleButtonColors {
   }
 
-  public final class IncludeFontPaddingHelper_androidKt {
-  }
-
   @androidx.compose.material3.ExperimentalMaterial3Api public final class InputChipDefaults {
     method public float getAvatarSize();
     method public float getHeight();
@@ -686,9 +665,6 @@
   @androidx.compose.runtime.Immutable public final class MenuItemColors {
   }
 
-  public final class MenuKt {
-  }
-
   public final class ModalBottomSheetKt {
     method @androidx.compose.material3.ExperimentalMaterial3Api @androidx.compose.runtime.Composable public static void ModalBottomSheet(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material3.SheetState sheetState, optional androidx.compose.ui.graphics.Shape shape, optional long containerColor, optional long contentColor, optional float tonalElevation, optional long scrimColor, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dragHandle, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
   }
@@ -925,9 +901,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   public final class SheetDefaultsKt {
     method @androidx.compose.material3.ExperimentalMaterial3Api @androidx.compose.runtime.Composable public static androidx.compose.material3.SheetState rememberSheetState(optional boolean skipHalfExpanded, optional kotlin.jvm.functions.Function1<? super androidx.compose.material3.SheetValue,java.lang.Boolean> confirmValueChange);
   }
@@ -1052,9 +1025,6 @@
     property public abstract boolean withDismissAction;
   }
 
-  public final class Strings_androidKt {
-  }
-
   public final class SuggestionChipDefaults {
     method @androidx.compose.runtime.Composable public androidx.compose.material3.ChipColors elevatedSuggestionChipColors(optional long containerColor, optional long labelColor, optional long iconContentColor, optional long disabledContainerColor, optional long disabledLabelColor, optional long disabledIconContentColor);
     method @androidx.compose.runtime.Composable public androidx.compose.material3.ChipElevation elevatedSuggestionChipElevation(optional float defaultElevation, optional float pressedElevation, optional float focusedElevation, optional float hoveredElevation, optional float draggedElevation, optional float disabledElevation);
@@ -1090,12 +1060,6 @@
     method @androidx.compose.material3.ExperimentalMaterial3Api @androidx.compose.runtime.Composable public static androidx.compose.material3.DismissState rememberDismissState(optional androidx.compose.material3.DismissValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material3.DismissValue,java.lang.Boolean> confirmValueChange, optional kotlin.jvm.functions.Function2<? super androidx.compose.ui.unit.Density,? super java.lang.Float,java.lang.Float> positionalThreshold);
   }
 
-  public final class SwipeableKt {
-  }
-
-  public final class SwipeableV2Kt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SwitchColors {
   }
 
@@ -1110,9 +1074,6 @@
     method @androidx.compose.runtime.Composable public static void Switch(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? thumbContent, optional boolean enabled, optional androidx.compose.material3.SwitchColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
   }
 
-  public final class SystemBarsDefaultInsets_androidKt {
-  }
-
   public final class TabKt {
     method @androidx.compose.runtime.Composable public static void LeadingIconTab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional long selectedContentColor, optional long unselectedContentColor, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
     method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional long selectedContentColor, optional long unselectedContentColor, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
@@ -1176,12 +1137,6 @@
     field public static final androidx.compose.material3.TextFieldDefaults INSTANCE;
   }
 
-  public final class TextFieldDefaultsKt {
-  }
-
-  public final class TextFieldImplKt {
-  }
-
   public final class TextFieldKt {
     method @androidx.compose.material3.ExperimentalMaterial3Api @androidx.compose.runtime.Composable public static void TextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? prefix, optional kotlin.jvm.functions.Function0<kotlin.Unit>? suffix, optional kotlin.jvm.functions.Function0<kotlin.Unit>? supportingText, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material3.TextFieldColors colors);
     method @androidx.compose.material3.ExperimentalMaterial3Api @androidx.compose.runtime.Composable public static void TextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? prefix, optional kotlin.jvm.functions.Function0<kotlin.Unit>? suffix, optional kotlin.jvm.functions.Function0<kotlin.Unit>? supportingText, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional int minLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material3.TextFieldColors colors);
@@ -1199,9 +1154,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
   }
 
-  public final class TimeFormat_androidKt {
-  }
-
   @androidx.compose.material3.ExperimentalMaterial3Api @androidx.compose.runtime.Immutable public final class TimePickerColors {
   }
 
@@ -1231,9 +1183,6 @@
     method public androidx.compose.runtime.saveable.Saver<androidx.compose.material3.TimePickerState,?> Saver();
   }
 
-  public final class TonalPaletteKt {
-  }
-
   @androidx.compose.material3.ExperimentalMaterial3Api public interface TooltipBoxScope {
     method public androidx.compose.ui.Modifier tooltipAnchor(androidx.compose.ui.Modifier);
   }
@@ -1344,15 +1293,5 @@
     property public final androidx.compose.ui.text.TextStyle titleSmall;
   }
 
-  public final class TypographyKt {
-  }
-
-}
-
-package androidx.compose.material3.internal {
-
-  public final class ExposedDropdownMenuPopupKt {
-  }
-
 }
 
diff --git a/compose/material3/material3/api/restricted_current.ignore b/compose/material3/material3/api/restricted_current.ignore
index 929472e..b29404c 100644
--- a/compose/material3/material3/api/restricted_current.ignore
+++ b/compose/material3/material3/api/restricted_current.ignore
@@ -1,3 +1,33 @@
 // Baseline format: 1.0
+RemovedClass: androidx.compose.material3.AlertDialogKt:
+    Removed class androidx.compose.material3.AlertDialogKt
+RemovedClass: androidx.compose.material3.DragGestureDetectorCopyKt:
+    Removed class androidx.compose.material3.DragGestureDetectorCopyKt
+RemovedClass: androidx.compose.material3.ElevationKt:
+    Removed class androidx.compose.material3.ElevationKt
+RemovedClass: androidx.compose.material3.IncludeFontPaddingHelper_androidKt:
+    Removed class androidx.compose.material3.IncludeFontPaddingHelper_androidKt
+RemovedClass: androidx.compose.material3.MenuKt:
+    Removed class androidx.compose.material3.MenuKt
+RemovedClass: androidx.compose.material3.ShapesKt:
+    Removed class androidx.compose.material3.ShapesKt
+RemovedClass: androidx.compose.material3.Strings_androidKt:
+    Removed class androidx.compose.material3.Strings_androidKt
+RemovedClass: androidx.compose.material3.SwipeableKt:
+    Removed class androidx.compose.material3.SwipeableKt
+RemovedClass: androidx.compose.material3.SystemBarsDefaultInsets_androidKt:
+    Removed class androidx.compose.material3.SystemBarsDefaultInsets_androidKt
+RemovedClass: androidx.compose.material3.TextFieldDefaultsKt:
+    Removed class androidx.compose.material3.TextFieldDefaultsKt
+RemovedClass: androidx.compose.material3.TextFieldImplKt:
+    Removed class androidx.compose.material3.TextFieldImplKt
+RemovedClass: androidx.compose.material3.TonalPaletteKt:
+    Removed class androidx.compose.material3.TonalPaletteKt
 RemovedClass: androidx.compose.material3.TouchTargetKt:
     Removed class androidx.compose.material3.TouchTargetKt
+RemovedClass: androidx.compose.material3.TypographyKt:
+    Removed class androidx.compose.material3.TypographyKt
+
+
+RemovedPackage: androidx.compose.material3.internal:
+    Removed package androidx.compose.material3.internal
diff --git a/compose/material3/material3/api/restricted_current.txt b/compose/material3/material3/api/restricted_current.txt
index 9033914..393c4e4 100644
--- a/compose/material3/material3/api/restricted_current.txt
+++ b/compose/material3/material3/api/restricted_current.txt
@@ -17,9 +17,6 @@
     field public static final androidx.compose.material3.AlertDialogDefaults INSTANCE;
   }
 
-  public final class AlertDialogKt {
-  }
-
   public final class AndroidAlertDialog_androidKt {
     method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long containerColor, optional long iconContentColor, optional long titleContentColor, optional long textContentColor, optional float tonalElevation, optional androidx.compose.ui.window.DialogProperties properties);
   }
@@ -120,12 +117,6 @@
     method @androidx.compose.runtime.Composable public static void TextButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material3.ButtonColors colors, optional androidx.compose.material3.ButtonElevation? elevation, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
   }
 
-  public final class CalendarModelKt {
-  }
-
-  public final class CalendarModel_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class CardColors {
   }
 
@@ -260,9 +251,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
   }
 
-  public final class DateInputKt {
-  }
-
   public final class DatePickerDialog_androidKt {
   }
 
@@ -284,9 +272,6 @@
     method @androidx.compose.runtime.Composable public static void Divider(optional androidx.compose.ui.Modifier modifier, optional float thickness, optional long color);
   }
 
-  public final class DragGestureDetectorCopyKt {
-  }
-
   public final class DrawerDefaults {
     method @androidx.compose.runtime.Composable public long getContainerColor();
     method public float getDismissibleDrawerElevation();
@@ -344,9 +329,6 @@
     method @RequiresApi(android.os.Build.VERSION_CODES.S) public static androidx.compose.material3.ColorScheme dynamicLightColorScheme(android.content.Context context);
   }
 
-  public final class ElevationKt {
-  }
-
   public final class ExposedDropdownMenuKt {
   }
 
@@ -432,9 +414,6 @@
   @androidx.compose.runtime.Immutable public final class IconToggleButtonColors {
   }
 
-  public final class IncludeFontPaddingHelper_androidKt {
-  }
-
   public final class InteractiveComponentSizeKt {
     method public static androidx.compose.ui.Modifier minimumInteractiveComponentSize(androidx.compose.ui.Modifier);
   }
@@ -483,9 +462,6 @@
   @androidx.compose.runtime.Immutable public final class MenuItemColors {
   }
 
-  public final class MenuKt {
-  }
-
   public final class ModalBottomSheetKt {
   }
 
@@ -666,9 +642,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   public final class SheetDefaultsKt {
   }
 
@@ -762,9 +735,6 @@
     property public abstract boolean withDismissAction;
   }
 
-  public final class Strings_androidKt {
-  }
-
   public final class SuggestionChipDefaults {
     method @androidx.compose.runtime.Composable public androidx.compose.material3.ChipColors elevatedSuggestionChipColors(optional long containerColor, optional long labelColor, optional long iconContentColor, optional long disabledContainerColor, optional long disabledLabelColor, optional long disabledIconContentColor);
     method @androidx.compose.runtime.Composable public androidx.compose.material3.ChipElevation elevatedSuggestionChipElevation(optional float defaultElevation, optional float pressedElevation, optional float focusedElevation, optional float hoveredElevation, optional float draggedElevation, optional float disabledElevation);
@@ -789,12 +759,6 @@
   public final class SwipeToDismissKt {
   }
 
-  public final class SwipeableKt {
-  }
-
-  public final class SwipeableV2Kt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SwitchColors {
   }
 
@@ -809,9 +773,6 @@
     method @androidx.compose.runtime.Composable public static void Switch(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? thumbContent, optional boolean enabled, optional androidx.compose.material3.SwitchColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
   }
 
-  public final class SystemBarsDefaultInsets_androidKt {
-  }
-
   public final class TabKt {
     method @androidx.compose.runtime.Composable public static void LeadingIconTab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional long selectedContentColor, optional long unselectedContentColor, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
     method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional long selectedContentColor, optional long unselectedContentColor, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
@@ -845,12 +806,6 @@
   @androidx.compose.runtime.Immutable public final class TextFieldColors {
   }
 
-  public final class TextFieldDefaultsKt {
-  }
-
-  public final class TextFieldImplKt {
-  }
-
   public final class TextFieldKt {
   }
 
@@ -864,9 +819,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
   }
 
-  public final class TimeFormat_androidKt {
-  }
-
   public final class TimePickerKt {
   }
 
@@ -886,9 +838,6 @@
     method public androidx.compose.runtime.saveable.Saver<androidx.compose.material3.TimePickerState,?> Saver();
   }
 
-  public final class TonalPaletteKt {
-  }
-
   public final class TooltipKt {
   }
 
@@ -927,15 +876,5 @@
     property public final androidx.compose.ui.text.TextStyle titleSmall;
   }
 
-  public final class TypographyKt {
-  }
-
-}
-
-package androidx.compose.material3.internal {
-
-  public final class ExposedDropdownMenuPopupKt {
-  }
-
 }
 
diff --git a/compose/runtime/runtime/api/1.4.0-beta01.txt b/compose/runtime/runtime/api/1.4.0-beta01.txt
index 71912fe..db6a889 100644
--- a/compose/runtime/runtime/api/1.4.0-beta01.txt
+++ b/compose/runtime/runtime/api/1.4.0-beta01.txt
@@ -21,9 +21,6 @@
     property @Deprecated public static final androidx.compose.runtime.MonotonicFrameClock DefaultMonotonicFrameClock;
   }
 
-  public final class ActualJvm_jvmKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface Applier<N> {
     method public void clear();
     method public void down(N? node);
@@ -38,9 +35,6 @@
     property public abstract N! current;
   }
 
-  public final class BitwiseOperatorsKt {
-  }
-
   public final class BroadcastFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public BroadcastFrameClock(optional kotlin.jvm.functions.Function0<kotlin.Unit>? onNewAwaiters);
     method public void cancel(optional java.util.concurrent.CancellationException cancellationException);
@@ -196,9 +190,6 @@
   public abstract class CompositionContext {
   }
 
-  public final class CompositionContextKt {
-  }
-
   public final class CompositionKt {
     method public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
     method @org.jetbrains.annotations.TestOnly public static androidx.compose.runtime.ControlledComposition ControlledComposition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
@@ -265,9 +256,6 @@
     method @androidx.compose.runtime.Composable public static inline kotlinx.coroutines.CoroutineScope rememberCoroutineScope(optional kotlin.jvm.functions.Function0<? extends kotlin.coroutines.CoroutineContext> getContext);
   }
 
-  public final class ExpectKt {
-  }
-
   @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ExplicitGroupsComposable {
   }
 
@@ -350,9 +338,6 @@
     method public void invalidate();
   }
 
-  public final class RecomposeScopeImplKt {
-  }
-
   public final class Recomposer extends androidx.compose.runtime.CompositionContext {
     ctor public Recomposer(kotlin.coroutines.CoroutineContext effectCoroutineContext);
     method public androidx.compose.runtime.RecomposerInfo asRecomposerInfo();
@@ -416,9 +401,6 @@
     method public inline void update(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,kotlin.Unit> block);
   }
 
-  public final class SlotTableKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface SnapshotMutationPolicy<T> {
     method public boolean equivalent(T? a, T? b);
     method public default T? merge(T? previous, T? current, T? applied);
@@ -565,9 +547,6 @@
     property public abstract T! value;
   }
 
-  public final class TraceKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class Updater<T> {
     ctor public Updater(@kotlin.PublishedApi androidx.compose.runtime.Composer composer);
     method public void init(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
@@ -582,9 +561,6 @@
 
 package androidx.compose.runtime.collection {
 
-  public final class ActualIntMap_androidKt {
-  }
-
   public final class MutableVector<T> implements java.util.RandomAccess {
     method public boolean add(T? element);
     method public void add(int index, T? element);
@@ -661,47 +637,6 @@
 
 }
 
-package androidx.compose.runtime.external.kotlinx.collections.immutable {
-
-  public final class ExtensionsKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList {
-
-  public final class UtilsKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap {
-
-  public final class PersistentHashMapContentIteratorsKt {
-  }
-
-  public final class TrieNodeKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet {
-
-  public final class TrieNodeKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.internal {
-
-  public final class CommonFunctionsKt {
-  }
-
-  public final class ForEachOneBitKt {
-  }
-
-}
-
 package androidx.compose.runtime.internal {
 
   @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambda extends kotlin.jvm.functions.Function2<androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function10<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function11<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function13<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function14<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function15<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function16<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function17<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function18<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function19<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function20<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function21<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function3<java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function4<java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function5<java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function6<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function7<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function8<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function9<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> {
@@ -742,9 +677,6 @@
     property public abstract String file;
   }
 
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
   @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface LiveLiteralFileInfo {
     method public abstract String file();
     property public abstract String file;
@@ -767,9 +699,6 @@
     property public abstract int parameters;
   }
 
-  public final class ThreadMapKt {
-  }
-
 }
 
 package androidx.compose.runtime.reflect {
@@ -794,9 +723,6 @@
 
 package androidx.compose.runtime.snapshots {
 
-  public final class ListUtilsKt {
-  }
-
   public class MutableSnapshot extends androidx.compose.runtime.snapshots.Snapshot {
     method public androidx.compose.runtime.snapshots.SnapshotApplyResult apply();
     method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getReadObserver();
@@ -876,12 +802,6 @@
   public final class SnapshotContextElementKt {
   }
 
-  public final class SnapshotDoubleIndexHeapKt {
-  }
-
-  public final class SnapshotIdSetKt {
-  }
-
   public final class SnapshotKt {
     method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state);
     method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot);
@@ -926,9 +846,6 @@
     property public int size;
   }
 
-  public final class SnapshotStateListKt {
-  }
-
   @androidx.compose.runtime.Stable public final class SnapshotStateMap<K, V> implements kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> androidx.compose.runtime.snapshots.StateObject {
     ctor public SnapshotStateMap();
     method public void clear();
@@ -953,9 +870,6 @@
     property public java.util.Collection<V> values;
   }
 
-  public final class SnapshotStateMapKt {
-  }
-
   public final class SnapshotStateObserver {
     ctor public SnapshotStateObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> onChangedExecutor);
     method public void clear(Object scope);
diff --git a/compose/runtime/runtime/api/current.ignore b/compose/runtime/runtime/api/current.ignore
index b2e1b75..af94053 100644
--- a/compose/runtime/runtime/api/current.ignore
+++ b/compose/runtime/runtime/api/current.ignore
@@ -7,5 +7,47 @@
     Added method androidx.compose.runtime.Composer.getCurrentMarker()
 
 
+RemovedClass: androidx.compose.runtime.ActualJvm_jvmKt:
+    Removed class androidx.compose.runtime.ActualJvm_jvmKt
+RemovedClass: androidx.compose.runtime.BitwiseOperatorsKt:
+    Removed class androidx.compose.runtime.BitwiseOperatorsKt
+RemovedClass: androidx.compose.runtime.CompositionContextKt:
+    Removed class androidx.compose.runtime.CompositionContextKt
+RemovedClass: androidx.compose.runtime.ExpectKt:
+    Removed class androidx.compose.runtime.ExpectKt
+RemovedClass: androidx.compose.runtime.RecomposeScopeImplKt:
+    Removed class androidx.compose.runtime.RecomposeScopeImplKt
+RemovedClass: androidx.compose.runtime.SlotTableKt:
+    Removed class androidx.compose.runtime.SlotTableKt
+RemovedClass: androidx.compose.runtime.TraceKt:
+    Removed class androidx.compose.runtime.TraceKt
+RemovedClass: androidx.compose.runtime.internal.JvmDefaultWithCompatibility_jvmKt:
+    Removed class androidx.compose.runtime.internal.JvmDefaultWithCompatibility_jvmKt
+RemovedClass: androidx.compose.runtime.internal.ThreadMapKt:
+    Removed class androidx.compose.runtime.internal.ThreadMapKt
+RemovedClass: androidx.compose.runtime.snapshots.ListUtilsKt:
+    Removed class androidx.compose.runtime.snapshots.ListUtilsKt
+RemovedClass: androidx.compose.runtime.snapshots.SnapshotDoubleIndexHeapKt:
+    Removed class androidx.compose.runtime.snapshots.SnapshotDoubleIndexHeapKt
+RemovedClass: androidx.compose.runtime.snapshots.SnapshotIdSetKt:
+    Removed class androidx.compose.runtime.snapshots.SnapshotIdSetKt
+RemovedClass: androidx.compose.runtime.snapshots.SnapshotStateListKt:
+    Removed class androidx.compose.runtime.snapshots.SnapshotStateListKt
+RemovedClass: androidx.compose.runtime.snapshots.SnapshotStateMapKt:
+    Removed class androidx.compose.runtime.snapshots.SnapshotStateMapKt
+
+
 RemovedMethod: androidx.compose.runtime.collection.MutableVectorKt#mutableVectorOf(T):
     Removed method androidx.compose.runtime.collection.MutableVectorKt.mutableVectorOf(T)
+
+
+RemovedPackage: androidx.compose.runtime.external.kotlinx.collections.immutable:
+    Removed package androidx.compose.runtime.external.kotlinx.collections.immutable
+RemovedPackage: androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList:
+    Removed package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList
+RemovedPackage: androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap:
+    Removed package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap
+RemovedPackage: androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet:
+    Removed package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet
+RemovedPackage: androidx.compose.runtime.external.kotlinx.collections.immutable.internal:
+    Removed package androidx.compose.runtime.external.kotlinx.collections.immutable.internal
diff --git a/compose/runtime/runtime/api/current.txt b/compose/runtime/runtime/api/current.txt
index 71912fe..db6a889 100644
--- a/compose/runtime/runtime/api/current.txt
+++ b/compose/runtime/runtime/api/current.txt
@@ -21,9 +21,6 @@
     property @Deprecated public static final androidx.compose.runtime.MonotonicFrameClock DefaultMonotonicFrameClock;
   }
 
-  public final class ActualJvm_jvmKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface Applier<N> {
     method public void clear();
     method public void down(N? node);
@@ -38,9 +35,6 @@
     property public abstract N! current;
   }
 
-  public final class BitwiseOperatorsKt {
-  }
-
   public final class BroadcastFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public BroadcastFrameClock(optional kotlin.jvm.functions.Function0<kotlin.Unit>? onNewAwaiters);
     method public void cancel(optional java.util.concurrent.CancellationException cancellationException);
@@ -196,9 +190,6 @@
   public abstract class CompositionContext {
   }
 
-  public final class CompositionContextKt {
-  }
-
   public final class CompositionKt {
     method public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
     method @org.jetbrains.annotations.TestOnly public static androidx.compose.runtime.ControlledComposition ControlledComposition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
@@ -265,9 +256,6 @@
     method @androidx.compose.runtime.Composable public static inline kotlinx.coroutines.CoroutineScope rememberCoroutineScope(optional kotlin.jvm.functions.Function0<? extends kotlin.coroutines.CoroutineContext> getContext);
   }
 
-  public final class ExpectKt {
-  }
-
   @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ExplicitGroupsComposable {
   }
 
@@ -350,9 +338,6 @@
     method public void invalidate();
   }
 
-  public final class RecomposeScopeImplKt {
-  }
-
   public final class Recomposer extends androidx.compose.runtime.CompositionContext {
     ctor public Recomposer(kotlin.coroutines.CoroutineContext effectCoroutineContext);
     method public androidx.compose.runtime.RecomposerInfo asRecomposerInfo();
@@ -416,9 +401,6 @@
     method public inline void update(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,kotlin.Unit> block);
   }
 
-  public final class SlotTableKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface SnapshotMutationPolicy<T> {
     method public boolean equivalent(T? a, T? b);
     method public default T? merge(T? previous, T? current, T? applied);
@@ -565,9 +547,6 @@
     property public abstract T! value;
   }
 
-  public final class TraceKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class Updater<T> {
     ctor public Updater(@kotlin.PublishedApi androidx.compose.runtime.Composer composer);
     method public void init(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
@@ -582,9 +561,6 @@
 
 package androidx.compose.runtime.collection {
 
-  public final class ActualIntMap_androidKt {
-  }
-
   public final class MutableVector<T> implements java.util.RandomAccess {
     method public boolean add(T? element);
     method public void add(int index, T? element);
@@ -661,47 +637,6 @@
 
 }
 
-package androidx.compose.runtime.external.kotlinx.collections.immutable {
-
-  public final class ExtensionsKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList {
-
-  public final class UtilsKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap {
-
-  public final class PersistentHashMapContentIteratorsKt {
-  }
-
-  public final class TrieNodeKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet {
-
-  public final class TrieNodeKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.internal {
-
-  public final class CommonFunctionsKt {
-  }
-
-  public final class ForEachOneBitKt {
-  }
-
-}
-
 package androidx.compose.runtime.internal {
 
   @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambda extends kotlin.jvm.functions.Function2<androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function10<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function11<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function13<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function14<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function15<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function16<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function17<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function18<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function19<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function20<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function21<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function3<java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function4<java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function5<java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function6<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function7<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function8<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function9<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> {
@@ -742,9 +677,6 @@
     property public abstract String file;
   }
 
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
   @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface LiveLiteralFileInfo {
     method public abstract String file();
     property public abstract String file;
@@ -767,9 +699,6 @@
     property public abstract int parameters;
   }
 
-  public final class ThreadMapKt {
-  }
-
 }
 
 package androidx.compose.runtime.reflect {
@@ -794,9 +723,6 @@
 
 package androidx.compose.runtime.snapshots {
 
-  public final class ListUtilsKt {
-  }
-
   public class MutableSnapshot extends androidx.compose.runtime.snapshots.Snapshot {
     method public androidx.compose.runtime.snapshots.SnapshotApplyResult apply();
     method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getReadObserver();
@@ -876,12 +802,6 @@
   public final class SnapshotContextElementKt {
   }
 
-  public final class SnapshotDoubleIndexHeapKt {
-  }
-
-  public final class SnapshotIdSetKt {
-  }
-
   public final class SnapshotKt {
     method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state);
     method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot);
@@ -926,9 +846,6 @@
     property public int size;
   }
 
-  public final class SnapshotStateListKt {
-  }
-
   @androidx.compose.runtime.Stable public final class SnapshotStateMap<K, V> implements kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> androidx.compose.runtime.snapshots.StateObject {
     ctor public SnapshotStateMap();
     method public void clear();
@@ -953,9 +870,6 @@
     property public java.util.Collection<V> values;
   }
 
-  public final class SnapshotStateMapKt {
-  }
-
   public final class SnapshotStateObserver {
     ctor public SnapshotStateObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> onChangedExecutor);
     method public void clear(Object scope);
diff --git a/compose/runtime/runtime/api/public_plus_experimental_1.4.0-beta01.txt b/compose/runtime/runtime/api/public_plus_experimental_1.4.0-beta01.txt
index 291f5f9..ef1101e 100644
--- a/compose/runtime/runtime/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/runtime/runtime/api/public_plus_experimental_1.4.0-beta01.txt
@@ -21,9 +21,6 @@
     property @Deprecated public static final androidx.compose.runtime.MonotonicFrameClock DefaultMonotonicFrameClock;
   }
 
-  public final class ActualJvm_jvmKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface Applier<N> {
     method public void clear();
     method public void down(N? node);
@@ -38,9 +35,6 @@
     property public abstract N! current;
   }
 
-  public final class BitwiseOperatorsKt {
-  }
-
   public final class BroadcastFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public BroadcastFrameClock(optional kotlin.jvm.functions.Function0<kotlin.Unit>? onNewAwaiters);
     method public void cancel(optional java.util.concurrent.CancellationException cancellationException);
@@ -211,9 +205,6 @@
   public abstract class CompositionContext {
   }
 
-  public final class CompositionContextKt {
-  }
-
   public final class CompositionKt {
     method public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
     method @androidx.compose.runtime.ExperimentalComposeApi public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent, kotlin.coroutines.CoroutineContext recomposeCoroutineContext);
@@ -292,9 +283,6 @@
     method @androidx.compose.runtime.Composable public static inline kotlinx.coroutines.CoroutineScope rememberCoroutineScope(optional kotlin.jvm.functions.Function0<? extends kotlin.coroutines.CoroutineContext> getContext);
   }
 
-  public final class ExpectKt {
-  }
-
   @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.ERROR, message="This is an experimental API for Compose and is likely to change before becoming " + "stable.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ExperimentalComposeApi {
   }
 
@@ -398,9 +386,6 @@
     method public void invalidate();
   }
 
-  public final class RecomposeScopeImplKt {
-  }
-
   public final class Recomposer extends androidx.compose.runtime.CompositionContext {
     ctor public Recomposer(kotlin.coroutines.CoroutineContext effectCoroutineContext);
     method public androidx.compose.runtime.RecomposerInfo asRecomposerInfo();
@@ -465,9 +450,6 @@
     method public inline void update(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,kotlin.Unit> block);
   }
 
-  public final class SlotTableKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface SnapshotMutationPolicy<T> {
     method public boolean equivalent(T? a, T? b);
     method public default T? merge(T? previous, T? current, T? applied);
@@ -614,9 +596,6 @@
     property public abstract T! value;
   }
 
-  public final class TraceKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class Updater<T> {
     ctor public Updater(@kotlin.PublishedApi androidx.compose.runtime.Composer composer);
     method public void init(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
@@ -631,9 +610,6 @@
 
 package androidx.compose.runtime.collection {
 
-  public final class ActualIntMap_androidKt {
-  }
-
   public final class MutableVector<T> implements java.util.RandomAccess {
     method public boolean add(T? element);
     method public void add(int index, T? element);
@@ -710,47 +686,6 @@
 
 }
 
-package androidx.compose.runtime.external.kotlinx.collections.immutable {
-
-  public final class ExtensionsKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList {
-
-  public final class UtilsKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap {
-
-  public final class PersistentHashMapContentIteratorsKt {
-  }
-
-  public final class TrieNodeKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet {
-
-  public final class TrieNodeKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.internal {
-
-  public final class CommonFunctionsKt {
-  }
-
-  public final class ForEachOneBitKt {
-  }
-
-}
-
 package androidx.compose.runtime.internal {
 
   @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambda extends kotlin.jvm.functions.Function2<androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function10<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function11<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function13<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function14<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function15<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function16<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function17<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function18<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function19<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function20<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function21<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function3<java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function4<java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function5<java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function6<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function7<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function8<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function9<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> {
@@ -805,9 +740,6 @@
     property public abstract String file;
   }
 
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
   @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface LiveLiteralFileInfo {
     method public abstract String file();
     property public abstract String file;
@@ -833,9 +765,6 @@
     property public abstract int parameters;
   }
 
-  public final class ThreadMapKt {
-  }
-
 }
 
 package androidx.compose.runtime.reflect {
@@ -860,9 +789,6 @@
 
 package androidx.compose.runtime.snapshots {
 
-  public final class ListUtilsKt {
-  }
-
   public class MutableSnapshot extends androidx.compose.runtime.snapshots.Snapshot {
     method public androidx.compose.runtime.snapshots.SnapshotApplyResult apply();
     method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getReadObserver();
@@ -953,12 +879,6 @@
     method @androidx.compose.runtime.ExperimentalComposeApi public static androidx.compose.runtime.snapshots.SnapshotContextElement asContextElement(androidx.compose.runtime.snapshots.Snapshot);
   }
 
-  public final class SnapshotDoubleIndexHeapKt {
-  }
-
-  public final class SnapshotIdSetKt {
-  }
-
   public final class SnapshotKt {
     method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state);
     method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot);
@@ -1003,9 +923,6 @@
     property public int size;
   }
 
-  public final class SnapshotStateListKt {
-  }
-
   @androidx.compose.runtime.Stable public final class SnapshotStateMap<K, V> implements kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> androidx.compose.runtime.snapshots.StateObject {
     ctor public SnapshotStateMap();
     method public void clear();
@@ -1030,9 +947,6 @@
     property public java.util.Collection<V> values;
   }
 
-  public final class SnapshotStateMapKt {
-  }
-
   public final class SnapshotStateObserver {
     ctor public SnapshotStateObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> onChangedExecutor);
     method public void clear(Object scope);
diff --git a/compose/runtime/runtime/api/public_plus_experimental_current.txt b/compose/runtime/runtime/api/public_plus_experimental_current.txt
index 291f5f9..ef1101e 100644
--- a/compose/runtime/runtime/api/public_plus_experimental_current.txt
+++ b/compose/runtime/runtime/api/public_plus_experimental_current.txt
@@ -21,9 +21,6 @@
     property @Deprecated public static final androidx.compose.runtime.MonotonicFrameClock DefaultMonotonicFrameClock;
   }
 
-  public final class ActualJvm_jvmKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface Applier<N> {
     method public void clear();
     method public void down(N? node);
@@ -38,9 +35,6 @@
     property public abstract N! current;
   }
 
-  public final class BitwiseOperatorsKt {
-  }
-
   public final class BroadcastFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public BroadcastFrameClock(optional kotlin.jvm.functions.Function0<kotlin.Unit>? onNewAwaiters);
     method public void cancel(optional java.util.concurrent.CancellationException cancellationException);
@@ -211,9 +205,6 @@
   public abstract class CompositionContext {
   }
 
-  public final class CompositionContextKt {
-  }
-
   public final class CompositionKt {
     method public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
     method @androidx.compose.runtime.ExperimentalComposeApi public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent, kotlin.coroutines.CoroutineContext recomposeCoroutineContext);
@@ -292,9 +283,6 @@
     method @androidx.compose.runtime.Composable public static inline kotlinx.coroutines.CoroutineScope rememberCoroutineScope(optional kotlin.jvm.functions.Function0<? extends kotlin.coroutines.CoroutineContext> getContext);
   }
 
-  public final class ExpectKt {
-  }
-
   @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.ERROR, message="This is an experimental API for Compose and is likely to change before becoming " + "stable.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ExperimentalComposeApi {
   }
 
@@ -398,9 +386,6 @@
     method public void invalidate();
   }
 
-  public final class RecomposeScopeImplKt {
-  }
-
   public final class Recomposer extends androidx.compose.runtime.CompositionContext {
     ctor public Recomposer(kotlin.coroutines.CoroutineContext effectCoroutineContext);
     method public androidx.compose.runtime.RecomposerInfo asRecomposerInfo();
@@ -465,9 +450,6 @@
     method public inline void update(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,kotlin.Unit> block);
   }
 
-  public final class SlotTableKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface SnapshotMutationPolicy<T> {
     method public boolean equivalent(T? a, T? b);
     method public default T? merge(T? previous, T? current, T? applied);
@@ -614,9 +596,6 @@
     property public abstract T! value;
   }
 
-  public final class TraceKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class Updater<T> {
     ctor public Updater(@kotlin.PublishedApi androidx.compose.runtime.Composer composer);
     method public void init(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
@@ -631,9 +610,6 @@
 
 package androidx.compose.runtime.collection {
 
-  public final class ActualIntMap_androidKt {
-  }
-
   public final class MutableVector<T> implements java.util.RandomAccess {
     method public boolean add(T? element);
     method public void add(int index, T? element);
@@ -710,47 +686,6 @@
 
 }
 
-package androidx.compose.runtime.external.kotlinx.collections.immutable {
-
-  public final class ExtensionsKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList {
-
-  public final class UtilsKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap {
-
-  public final class PersistentHashMapContentIteratorsKt {
-  }
-
-  public final class TrieNodeKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet {
-
-  public final class TrieNodeKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.internal {
-
-  public final class CommonFunctionsKt {
-  }
-
-  public final class ForEachOneBitKt {
-  }
-
-}
-
 package androidx.compose.runtime.internal {
 
   @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambda extends kotlin.jvm.functions.Function2<androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function10<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function11<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function13<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function14<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function15<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function16<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function17<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function18<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function19<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function20<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function21<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function3<java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function4<java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function5<java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function6<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function7<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function8<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function9<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> {
@@ -805,9 +740,6 @@
     property public abstract String file;
   }
 
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
   @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface LiveLiteralFileInfo {
     method public abstract String file();
     property public abstract String file;
@@ -833,9 +765,6 @@
     property public abstract int parameters;
   }
 
-  public final class ThreadMapKt {
-  }
-
 }
 
 package androidx.compose.runtime.reflect {
@@ -860,9 +789,6 @@
 
 package androidx.compose.runtime.snapshots {
 
-  public final class ListUtilsKt {
-  }
-
   public class MutableSnapshot extends androidx.compose.runtime.snapshots.Snapshot {
     method public androidx.compose.runtime.snapshots.SnapshotApplyResult apply();
     method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getReadObserver();
@@ -953,12 +879,6 @@
     method @androidx.compose.runtime.ExperimentalComposeApi public static androidx.compose.runtime.snapshots.SnapshotContextElement asContextElement(androidx.compose.runtime.snapshots.Snapshot);
   }
 
-  public final class SnapshotDoubleIndexHeapKt {
-  }
-
-  public final class SnapshotIdSetKt {
-  }
-
   public final class SnapshotKt {
     method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state);
     method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot);
@@ -1003,9 +923,6 @@
     property public int size;
   }
 
-  public final class SnapshotStateListKt {
-  }
-
   @androidx.compose.runtime.Stable public final class SnapshotStateMap<K, V> implements kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> androidx.compose.runtime.snapshots.StateObject {
     ctor public SnapshotStateMap();
     method public void clear();
@@ -1030,9 +947,6 @@
     property public java.util.Collection<V> values;
   }
 
-  public final class SnapshotStateMapKt {
-  }
-
   public final class SnapshotStateObserver {
     ctor public SnapshotStateObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> onChangedExecutor);
     method public void clear(Object scope);
diff --git a/compose/runtime/runtime/api/restricted_1.4.0-beta01.txt b/compose/runtime/runtime/api/restricted_1.4.0-beta01.txt
index f0329cb..5a79fb1 100644
--- a/compose/runtime/runtime/api/restricted_1.4.0-beta01.txt
+++ b/compose/runtime/runtime/api/restricted_1.4.0-beta01.txt
@@ -39,9 +39,6 @@
     property public abstract N! current;
   }
 
-  public final class BitwiseOperatorsKt {
-  }
-
   public final class BroadcastFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public BroadcastFrameClock(optional kotlin.jvm.functions.Function0<kotlin.Unit>? onNewAwaiters);
     method public void cancel(optional java.util.concurrent.CancellationException cancellationException);
@@ -211,9 +208,6 @@
   public abstract class CompositionContext {
   }
 
-  public final class CompositionContextKt {
-  }
-
   public final class CompositionKt {
     method public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
     method @org.jetbrains.annotations.TestOnly public static androidx.compose.runtime.ControlledComposition ControlledComposition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
@@ -443,9 +437,6 @@
     method public inline void update(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,kotlin.Unit> block);
   }
 
-  public final class SlotTableKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface SnapshotMutationPolicy<T> {
     method public boolean equivalent(T? a, T? b);
     method public default T? merge(T? previous, T? current, T? applied);
@@ -592,9 +583,6 @@
     property public abstract T! value;
   }
 
-  public final class TraceKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class Updater<T> {
     ctor public Updater(@kotlin.PublishedApi androidx.compose.runtime.Composer composer);
     method public void init(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
@@ -609,9 +597,6 @@
 
 package androidx.compose.runtime.collection {
 
-  public final class ActualIntMap_androidKt {
-  }
-
   public final class MutableVector<T> implements java.util.RandomAccess {
     ctor @kotlin.PublishedApi internal MutableVector(@kotlin.PublishedApi T![] content, int size);
     method public boolean add(T? element);
@@ -690,47 +675,6 @@
 
 }
 
-package androidx.compose.runtime.external.kotlinx.collections.immutable {
-
-  public final class ExtensionsKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList {
-
-  public final class UtilsKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap {
-
-  public final class PersistentHashMapContentIteratorsKt {
-  }
-
-  public final class TrieNodeKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet {
-
-  public final class TrieNodeKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.internal {
-
-  public final class CommonFunctionsKt {
-  }
-
-  public final class ForEachOneBitKt {
-  }
-
-}
-
 package androidx.compose.runtime.internal {
 
   @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambda extends kotlin.jvm.functions.Function2<androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function10<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function11<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function13<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function14<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function15<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function16<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function17<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function18<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function19<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function20<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function21<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function3<java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function4<java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function5<java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function6<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function7<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function8<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function9<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> {
@@ -771,9 +715,6 @@
     property public abstract String file;
   }
 
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
   @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface LiveLiteralFileInfo {
     method public abstract String file();
     property public abstract String file;
@@ -796,9 +737,6 @@
     property public abstract int parameters;
   }
 
-  public final class ThreadMapKt {
-  }
-
 }
 
 package androidx.compose.runtime.reflect {
@@ -823,9 +761,6 @@
 
 package androidx.compose.runtime.snapshots {
 
-  public final class ListUtilsKt {
-  }
-
   public class MutableSnapshot extends androidx.compose.runtime.snapshots.Snapshot {
     method public androidx.compose.runtime.snapshots.SnapshotApplyResult apply();
     method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getReadObserver();
@@ -910,12 +845,6 @@
   public final class SnapshotContextElementKt {
   }
 
-  public final class SnapshotDoubleIndexHeapKt {
-  }
-
-  public final class SnapshotIdSetKt {
-  }
-
   public final class SnapshotKt {
     method @kotlin.PublishedApi internal static <T extends androidx.compose.runtime.snapshots.StateRecord> T current(T r, androidx.compose.runtime.snapshots.Snapshot snapshot);
     method @kotlin.PublishedApi internal static <T extends androidx.compose.runtime.snapshots.StateRecord> T current(T r);
@@ -967,9 +896,6 @@
     property public int size;
   }
 
-  public final class SnapshotStateListKt {
-  }
-
   @androidx.compose.runtime.Stable public final class SnapshotStateMap<K, V> implements kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> androidx.compose.runtime.snapshots.StateObject {
     ctor public SnapshotStateMap();
     method public void clear();
@@ -994,9 +920,6 @@
     property public java.util.Collection<V> values;
   }
 
-  public final class SnapshotStateMapKt {
-  }
-
   public final class SnapshotStateObserver {
     ctor public SnapshotStateObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> onChangedExecutor);
     method public void clear(Object scope);
diff --git a/compose/runtime/runtime/api/restricted_current.ignore b/compose/runtime/runtime/api/restricted_current.ignore
index b2e1b75..f2b8f6b 100644
--- a/compose/runtime/runtime/api/restricted_current.ignore
+++ b/compose/runtime/runtime/api/restricted_current.ignore
@@ -7,5 +7,41 @@
     Added method androidx.compose.runtime.Composer.getCurrentMarker()
 
 
+RemovedClass: androidx.compose.runtime.BitwiseOperatorsKt:
+    Removed class androidx.compose.runtime.BitwiseOperatorsKt
+RemovedClass: androidx.compose.runtime.CompositionContextKt:
+    Removed class androidx.compose.runtime.CompositionContextKt
+RemovedClass: androidx.compose.runtime.SlotTableKt:
+    Removed class androidx.compose.runtime.SlotTableKt
+RemovedClass: androidx.compose.runtime.TraceKt:
+    Removed class androidx.compose.runtime.TraceKt
+RemovedClass: androidx.compose.runtime.internal.JvmDefaultWithCompatibility_jvmKt:
+    Removed class androidx.compose.runtime.internal.JvmDefaultWithCompatibility_jvmKt
+RemovedClass: androidx.compose.runtime.internal.ThreadMapKt:
+    Removed class androidx.compose.runtime.internal.ThreadMapKt
+RemovedClass: androidx.compose.runtime.snapshots.ListUtilsKt:
+    Removed class androidx.compose.runtime.snapshots.ListUtilsKt
+RemovedClass: androidx.compose.runtime.snapshots.SnapshotDoubleIndexHeapKt:
+    Removed class androidx.compose.runtime.snapshots.SnapshotDoubleIndexHeapKt
+RemovedClass: androidx.compose.runtime.snapshots.SnapshotIdSetKt:
+    Removed class androidx.compose.runtime.snapshots.SnapshotIdSetKt
+RemovedClass: androidx.compose.runtime.snapshots.SnapshotStateListKt:
+    Removed class androidx.compose.runtime.snapshots.SnapshotStateListKt
+RemovedClass: androidx.compose.runtime.snapshots.SnapshotStateMapKt:
+    Removed class androidx.compose.runtime.snapshots.SnapshotStateMapKt
+
+
 RemovedMethod: androidx.compose.runtime.collection.MutableVectorKt#mutableVectorOf(T):
     Removed method androidx.compose.runtime.collection.MutableVectorKt.mutableVectorOf(T)
+
+
+RemovedPackage: androidx.compose.runtime.external.kotlinx.collections.immutable:
+    Removed package androidx.compose.runtime.external.kotlinx.collections.immutable
+RemovedPackage: androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList:
+    Removed package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList
+RemovedPackage: androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap:
+    Removed package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap
+RemovedPackage: androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet:
+    Removed package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet
+RemovedPackage: androidx.compose.runtime.external.kotlinx.collections.immutable.internal:
+    Removed package androidx.compose.runtime.external.kotlinx.collections.immutable.internal
diff --git a/compose/runtime/runtime/api/restricted_current.txt b/compose/runtime/runtime/api/restricted_current.txt
index f0329cb..5a79fb1 100644
--- a/compose/runtime/runtime/api/restricted_current.txt
+++ b/compose/runtime/runtime/api/restricted_current.txt
@@ -39,9 +39,6 @@
     property public abstract N! current;
   }
 
-  public final class BitwiseOperatorsKt {
-  }
-
   public final class BroadcastFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public BroadcastFrameClock(optional kotlin.jvm.functions.Function0<kotlin.Unit>? onNewAwaiters);
     method public void cancel(optional java.util.concurrent.CancellationException cancellationException);
@@ -211,9 +208,6 @@
   public abstract class CompositionContext {
   }
 
-  public final class CompositionContextKt {
-  }
-
   public final class CompositionKt {
     method public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
     method @org.jetbrains.annotations.TestOnly public static androidx.compose.runtime.ControlledComposition ControlledComposition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
@@ -443,9 +437,6 @@
     method public inline void update(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,kotlin.Unit> block);
   }
 
-  public final class SlotTableKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface SnapshotMutationPolicy<T> {
     method public boolean equivalent(T? a, T? b);
     method public default T? merge(T? previous, T? current, T? applied);
@@ -592,9 +583,6 @@
     property public abstract T! value;
   }
 
-  public final class TraceKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class Updater<T> {
     ctor public Updater(@kotlin.PublishedApi androidx.compose.runtime.Composer composer);
     method public void init(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
@@ -609,9 +597,6 @@
 
 package androidx.compose.runtime.collection {
 
-  public final class ActualIntMap_androidKt {
-  }
-
   public final class MutableVector<T> implements java.util.RandomAccess {
     ctor @kotlin.PublishedApi internal MutableVector(@kotlin.PublishedApi T![] content, int size);
     method public boolean add(T? element);
@@ -690,47 +675,6 @@
 
 }
 
-package androidx.compose.runtime.external.kotlinx.collections.immutable {
-
-  public final class ExtensionsKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList {
-
-  public final class UtilsKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap {
-
-  public final class PersistentHashMapContentIteratorsKt {
-  }
-
-  public final class TrieNodeKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet {
-
-  public final class TrieNodeKt {
-  }
-
-}
-
-package androidx.compose.runtime.external.kotlinx.collections.immutable.internal {
-
-  public final class CommonFunctionsKt {
-  }
-
-  public final class ForEachOneBitKt {
-  }
-
-}
-
 package androidx.compose.runtime.internal {
 
   @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambda extends kotlin.jvm.functions.Function2<androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function10<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function11<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function13<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function14<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function15<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function16<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function17<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function18<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function19<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function20<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function21<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function3<java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function4<java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function5<java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function6<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function7<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function8<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function9<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> {
@@ -771,9 +715,6 @@
     property public abstract String file;
   }
 
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
   @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface LiveLiteralFileInfo {
     method public abstract String file();
     property public abstract String file;
@@ -796,9 +737,6 @@
     property public abstract int parameters;
   }
 
-  public final class ThreadMapKt {
-  }
-
 }
 
 package androidx.compose.runtime.reflect {
@@ -823,9 +761,6 @@
 
 package androidx.compose.runtime.snapshots {
 
-  public final class ListUtilsKt {
-  }
-
   public class MutableSnapshot extends androidx.compose.runtime.snapshots.Snapshot {
     method public androidx.compose.runtime.snapshots.SnapshotApplyResult apply();
     method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getReadObserver();
@@ -910,12 +845,6 @@
   public final class SnapshotContextElementKt {
   }
 
-  public final class SnapshotDoubleIndexHeapKt {
-  }
-
-  public final class SnapshotIdSetKt {
-  }
-
   public final class SnapshotKt {
     method @kotlin.PublishedApi internal static <T extends androidx.compose.runtime.snapshots.StateRecord> T current(T r, androidx.compose.runtime.snapshots.Snapshot snapshot);
     method @kotlin.PublishedApi internal static <T extends androidx.compose.runtime.snapshots.StateRecord> T current(T r);
@@ -967,9 +896,6 @@
     property public int size;
   }
 
-  public final class SnapshotStateListKt {
-  }
-
   @androidx.compose.runtime.Stable public final class SnapshotStateMap<K, V> implements kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> androidx.compose.runtime.snapshots.StateObject {
     ctor public SnapshotStateMap();
     method public void clear();
@@ -994,9 +920,6 @@
     property public java.util.Collection<V> values;
   }
 
-  public final class SnapshotStateMapKt {
-  }
-
   public final class SnapshotStateObserver {
     ctor public SnapshotStateObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> onChangedExecutor);
     method public void clear(Object scope);
diff --git a/compose/ui/ui-geometry/api/1.4.0-beta01.txt b/compose/ui/ui-geometry/api/1.4.0-beta01.txt
index 0be492c..50b3067 100644
--- a/compose/ui/ui-geometry/api/1.4.0-beta01.txt
+++ b/compose/ui/ui-geometry/api/1.4.0-beta01.txt
@@ -27,9 +27,6 @@
     method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
   }
 
-  public final class GeometryUtilsKt {
-  }
-
   public final class MutableRect {
     ctor public MutableRect(float left, float top, float right, float bottom);
     method public operator boolean contains(long offset);
diff --git a/compose/ui/ui-geometry/api/current.ignore b/compose/ui/ui-geometry/api/current.ignore
new file mode 100644
index 0000000..c27b9c61
--- /dev/null
+++ b/compose/ui/ui-geometry/api/current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.ui.geometry.GeometryUtilsKt:
+    Removed class androidx.compose.ui.geometry.GeometryUtilsKt
diff --git a/compose/ui/ui-geometry/api/current.txt b/compose/ui/ui-geometry/api/current.txt
index 0be492c..50b3067 100644
--- a/compose/ui/ui-geometry/api/current.txt
+++ b/compose/ui/ui-geometry/api/current.txt
@@ -27,9 +27,6 @@
     method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
   }
 
-  public final class GeometryUtilsKt {
-  }
-
   public final class MutableRect {
     ctor public MutableRect(float left, float top, float right, float bottom);
     method public operator boolean contains(long offset);
diff --git a/compose/ui/ui-geometry/api/public_plus_experimental_1.4.0-beta01.txt b/compose/ui/ui-geometry/api/public_plus_experimental_1.4.0-beta01.txt
index 0be492c..50b3067 100644
--- a/compose/ui/ui-geometry/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/ui/ui-geometry/api/public_plus_experimental_1.4.0-beta01.txt
@@ -27,9 +27,6 @@
     method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
   }
 
-  public final class GeometryUtilsKt {
-  }
-
   public final class MutableRect {
     ctor public MutableRect(float left, float top, float right, float bottom);
     method public operator boolean contains(long offset);
diff --git a/compose/ui/ui-geometry/api/public_plus_experimental_current.txt b/compose/ui/ui-geometry/api/public_plus_experimental_current.txt
index 0be492c..50b3067 100644
--- a/compose/ui/ui-geometry/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-geometry/api/public_plus_experimental_current.txt
@@ -27,9 +27,6 @@
     method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
   }
 
-  public final class GeometryUtilsKt {
-  }
-
   public final class MutableRect {
     ctor public MutableRect(float left, float top, float right, float bottom);
     method public operator boolean contains(long offset);
diff --git a/compose/ui/ui-geometry/api/restricted_1.4.0-beta01.txt b/compose/ui/ui-geometry/api/restricted_1.4.0-beta01.txt
index 0be492c..50b3067 100644
--- a/compose/ui/ui-geometry/api/restricted_1.4.0-beta01.txt
+++ b/compose/ui/ui-geometry/api/restricted_1.4.0-beta01.txt
@@ -27,9 +27,6 @@
     method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
   }
 
-  public final class GeometryUtilsKt {
-  }
-
   public final class MutableRect {
     ctor public MutableRect(float left, float top, float right, float bottom);
     method public operator boolean contains(long offset);
diff --git a/compose/ui/ui-geometry/api/restricted_current.ignore b/compose/ui/ui-geometry/api/restricted_current.ignore
new file mode 100644
index 0000000..c27b9c61
--- /dev/null
+++ b/compose/ui/ui-geometry/api/restricted_current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.ui.geometry.GeometryUtilsKt:
+    Removed class androidx.compose.ui.geometry.GeometryUtilsKt
diff --git a/compose/ui/ui-geometry/api/restricted_current.txt b/compose/ui/ui-geometry/api/restricted_current.txt
index 0be492c..50b3067 100644
--- a/compose/ui/ui-geometry/api/restricted_current.txt
+++ b/compose/ui/ui-geometry/api/restricted_current.txt
@@ -27,9 +27,6 @@
     method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
   }
 
-  public final class GeometryUtilsKt {
-  }
-
   public final class MutableRect {
     ctor public MutableRect(float left, float top, float right, float bottom);
     method public operator boolean contains(long offset);
diff --git a/compose/ui/ui-graphics/api/1.4.0-beta01.txt b/compose/ui/ui-graphics/api/1.4.0-beta01.txt
index 358b6e6..d818cd8 100644
--- a/compose/ui/ui-graphics/api/1.4.0-beta01.txt
+++ b/compose/ui/ui-graphics/api/1.4.0-beta01.txt
@@ -136,9 +136,6 @@
     method public static androidx.compose.ui.graphics.RenderEffect asComposeRenderEffect(android.graphics.RenderEffect);
   }
 
-  public final class AndroidShader_androidKt {
-  }
-
   public final class AndroidTileMode_androidKt {
     method public static boolean isSupported(int);
     method public static android.graphics.Shader.TileMode toAndroidTileMode(int);
@@ -398,9 +395,6 @@
     property public final float[] values;
   }
 
-  public final class DegreesKt {
-  }
-
   @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class FilterQuality {
     method public int getValue();
     property public final int value;
@@ -418,9 +412,6 @@
     property public final int None;
   }
 
-  public final class Float16Kt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ImageBitmap {
     method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
     method public int getConfig();
@@ -1141,9 +1132,6 @@
     property public androidx.compose.ui.unit.LayoutDirection layoutDirection;
   }
 
-  public final class CanvasDrawScopeKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ContentDrawScope extends androidx.compose.ui.graphics.drawscope.DrawScope {
     method public void drawContent();
   }
@@ -1268,13 +1256,6 @@
 
 }
 
-package androidx.compose.ui.graphics.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.graphics.painter {
 
   public final class BitmapPainter extends androidx.compose.ui.graphics.painter.Painter {
@@ -1620,9 +1601,6 @@
     property public final float y;
   }
 
-  public final class PathNodeKt {
-  }
-
   public final class PathParser {
     ctor public PathParser();
     method public androidx.compose.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> nodes);
diff --git a/compose/ui/ui-graphics/api/current.ignore b/compose/ui/ui-graphics/api/current.ignore
index ac8aa37..cded3ab 100644
--- a/compose/ui/ui-graphics/api/current.ignore
+++ b/compose/ui/ui-graphics/api/current.ignore
@@ -3,3 +3,19 @@
     Added method androidx.compose.ui.graphics.PathMeasure.getPosition(float)
 AddedAbstractMethod: androidx.compose.ui.graphics.PathMeasure#getTangent(float):
     Added method androidx.compose.ui.graphics.PathMeasure.getTangent(float)
+
+
+RemovedClass: androidx.compose.ui.graphics.AndroidShader_androidKt:
+    Removed class androidx.compose.ui.graphics.AndroidShader_androidKt
+RemovedClass: androidx.compose.ui.graphics.DegreesKt:
+    Removed class androidx.compose.ui.graphics.DegreesKt
+RemovedClass: androidx.compose.ui.graphics.Float16Kt:
+    Removed class androidx.compose.ui.graphics.Float16Kt
+RemovedClass: androidx.compose.ui.graphics.drawscope.CanvasDrawScopeKt:
+    Removed class androidx.compose.ui.graphics.drawscope.CanvasDrawScopeKt
+RemovedClass: androidx.compose.ui.graphics.vector.PathNodeKt:
+    Removed class androidx.compose.ui.graphics.vector.PathNodeKt
+
+
+RemovedPackage: androidx.compose.ui.graphics.internal:
+    Removed package androidx.compose.ui.graphics.internal
diff --git a/compose/ui/ui-graphics/api/current.txt b/compose/ui/ui-graphics/api/current.txt
index 358b6e6..d818cd8 100644
--- a/compose/ui/ui-graphics/api/current.txt
+++ b/compose/ui/ui-graphics/api/current.txt
@@ -136,9 +136,6 @@
     method public static androidx.compose.ui.graphics.RenderEffect asComposeRenderEffect(android.graphics.RenderEffect);
   }
 
-  public final class AndroidShader_androidKt {
-  }
-
   public final class AndroidTileMode_androidKt {
     method public static boolean isSupported(int);
     method public static android.graphics.Shader.TileMode toAndroidTileMode(int);
@@ -398,9 +395,6 @@
     property public final float[] values;
   }
 
-  public final class DegreesKt {
-  }
-
   @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class FilterQuality {
     method public int getValue();
     property public final int value;
@@ -418,9 +412,6 @@
     property public final int None;
   }
 
-  public final class Float16Kt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ImageBitmap {
     method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
     method public int getConfig();
@@ -1141,9 +1132,6 @@
     property public androidx.compose.ui.unit.LayoutDirection layoutDirection;
   }
 
-  public final class CanvasDrawScopeKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ContentDrawScope extends androidx.compose.ui.graphics.drawscope.DrawScope {
     method public void drawContent();
   }
@@ -1268,13 +1256,6 @@
 
 }
 
-package androidx.compose.ui.graphics.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.graphics.painter {
 
   public final class BitmapPainter extends androidx.compose.ui.graphics.painter.Painter {
@@ -1620,9 +1601,6 @@
     property public final float y;
   }
 
-  public final class PathNodeKt {
-  }
-
   public final class PathParser {
     ctor public PathParser();
     method public androidx.compose.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> nodes);
diff --git a/compose/ui/ui-graphics/api/public_plus_experimental_1.4.0-beta01.txt b/compose/ui/ui-graphics/api/public_plus_experimental_1.4.0-beta01.txt
index 39ec0533..b8961c4 100644
--- a/compose/ui/ui-graphics/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/ui/ui-graphics/api/public_plus_experimental_1.4.0-beta01.txt
@@ -136,9 +136,6 @@
     method public static androidx.compose.ui.graphics.RenderEffect asComposeRenderEffect(android.graphics.RenderEffect);
   }
 
-  public final class AndroidShader_androidKt {
-  }
-
   public final class AndroidTileMode_androidKt {
     method public static boolean isSupported(int);
     method public static android.graphics.Shader.TileMode toAndroidTileMode(int);
@@ -398,9 +395,6 @@
     property public final float[] values;
   }
 
-  public final class DegreesKt {
-  }
-
   @kotlin.RequiresOptIn(message="This API is experimental and is likely to change in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalGraphicsApi {
   }
 
@@ -421,9 +415,6 @@
     property public final int None;
   }
 
-  public final class Float16Kt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ImageBitmap {
     method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
     method public int getConfig();
@@ -1144,9 +1135,6 @@
     property public androidx.compose.ui.unit.LayoutDirection layoutDirection;
   }
 
-  public final class CanvasDrawScopeKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ContentDrawScope extends androidx.compose.ui.graphics.drawscope.DrawScope {
     method public void drawContent();
   }
@@ -1271,13 +1259,6 @@
 
 }
 
-package androidx.compose.ui.graphics.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.graphics.painter {
 
   public final class BitmapPainter extends androidx.compose.ui.graphics.painter.Painter {
@@ -1623,9 +1604,6 @@
     property public final float y;
   }
 
-  public final class PathNodeKt {
-  }
-
   public final class PathParser {
     ctor public PathParser();
     method public androidx.compose.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> nodes);
diff --git a/compose/ui/ui-graphics/api/public_plus_experimental_current.txt b/compose/ui/ui-graphics/api/public_plus_experimental_current.txt
index 39ec0533..b8961c4 100644
--- a/compose/ui/ui-graphics/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-graphics/api/public_plus_experimental_current.txt
@@ -136,9 +136,6 @@
     method public static androidx.compose.ui.graphics.RenderEffect asComposeRenderEffect(android.graphics.RenderEffect);
   }
 
-  public final class AndroidShader_androidKt {
-  }
-
   public final class AndroidTileMode_androidKt {
     method public static boolean isSupported(int);
     method public static android.graphics.Shader.TileMode toAndroidTileMode(int);
@@ -398,9 +395,6 @@
     property public final float[] values;
   }
 
-  public final class DegreesKt {
-  }
-
   @kotlin.RequiresOptIn(message="This API is experimental and is likely to change in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalGraphicsApi {
   }
 
@@ -421,9 +415,6 @@
     property public final int None;
   }
 
-  public final class Float16Kt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ImageBitmap {
     method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
     method public int getConfig();
@@ -1144,9 +1135,6 @@
     property public androidx.compose.ui.unit.LayoutDirection layoutDirection;
   }
 
-  public final class CanvasDrawScopeKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ContentDrawScope extends androidx.compose.ui.graphics.drawscope.DrawScope {
     method public void drawContent();
   }
@@ -1271,13 +1259,6 @@
 
 }
 
-package androidx.compose.ui.graphics.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.graphics.painter {
 
   public final class BitmapPainter extends androidx.compose.ui.graphics.painter.Painter {
@@ -1623,9 +1604,6 @@
     property public final float y;
   }
 
-  public final class PathNodeKt {
-  }
-
   public final class PathParser {
     ctor public PathParser();
     method public androidx.compose.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> nodes);
diff --git a/compose/ui/ui-graphics/api/restricted_1.4.0-beta01.txt b/compose/ui/ui-graphics/api/restricted_1.4.0-beta01.txt
index 5dbda20..63742f0 100644
--- a/compose/ui/ui-graphics/api/restricted_1.4.0-beta01.txt
+++ b/compose/ui/ui-graphics/api/restricted_1.4.0-beta01.txt
@@ -166,9 +166,6 @@
     method public static androidx.compose.ui.graphics.RenderEffect asComposeRenderEffect(android.graphics.RenderEffect);
   }
 
-  public final class AndroidShader_androidKt {
-  }
-
   public final class AndroidTileMode_androidKt {
     method public static boolean isSupported(int);
     method public static android.graphics.Shader.TileMode toAndroidTileMode(int);
@@ -450,9 +447,6 @@
     property public final int None;
   }
 
-  public final class Float16Kt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ImageBitmap {
     method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
     method public int getConfig();
@@ -1197,9 +1191,6 @@
     property public final long size;
   }
 
-  public final class CanvasDrawScopeKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ContentDrawScope extends androidx.compose.ui.graphics.drawscope.DrawScope {
     method public void drawContent();
   }
@@ -1324,13 +1315,6 @@
 
 }
 
-package androidx.compose.ui.graphics.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.graphics.painter {
 
   public final class BitmapPainter extends androidx.compose.ui.graphics.painter.Painter {
@@ -1676,9 +1660,6 @@
     property public final float y;
   }
 
-  public final class PathNodeKt {
-  }
-
   public final class PathParser {
     ctor public PathParser();
     method public androidx.compose.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> nodes);
diff --git a/compose/ui/ui-graphics/api/restricted_current.ignore b/compose/ui/ui-graphics/api/restricted_current.ignore
index ac8aa37..8f7bb6b 100644
--- a/compose/ui/ui-graphics/api/restricted_current.ignore
+++ b/compose/ui/ui-graphics/api/restricted_current.ignore
@@ -3,3 +3,17 @@
     Added method androidx.compose.ui.graphics.PathMeasure.getPosition(float)
 AddedAbstractMethod: androidx.compose.ui.graphics.PathMeasure#getTangent(float):
     Added method androidx.compose.ui.graphics.PathMeasure.getTangent(float)
+
+
+RemovedClass: androidx.compose.ui.graphics.AndroidShader_androidKt:
+    Removed class androidx.compose.ui.graphics.AndroidShader_androidKt
+RemovedClass: androidx.compose.ui.graphics.Float16Kt:
+    Removed class androidx.compose.ui.graphics.Float16Kt
+RemovedClass: androidx.compose.ui.graphics.drawscope.CanvasDrawScopeKt:
+    Removed class androidx.compose.ui.graphics.drawscope.CanvasDrawScopeKt
+RemovedClass: androidx.compose.ui.graphics.vector.PathNodeKt:
+    Removed class androidx.compose.ui.graphics.vector.PathNodeKt
+
+
+RemovedPackage: androidx.compose.ui.graphics.internal:
+    Removed package androidx.compose.ui.graphics.internal
diff --git a/compose/ui/ui-graphics/api/restricted_current.txt b/compose/ui/ui-graphics/api/restricted_current.txt
index 5dbda20..63742f0 100644
--- a/compose/ui/ui-graphics/api/restricted_current.txt
+++ b/compose/ui/ui-graphics/api/restricted_current.txt
@@ -166,9 +166,6 @@
     method public static androidx.compose.ui.graphics.RenderEffect asComposeRenderEffect(android.graphics.RenderEffect);
   }
 
-  public final class AndroidShader_androidKt {
-  }
-
   public final class AndroidTileMode_androidKt {
     method public static boolean isSupported(int);
     method public static android.graphics.Shader.TileMode toAndroidTileMode(int);
@@ -450,9 +447,6 @@
     property public final int None;
   }
 
-  public final class Float16Kt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ImageBitmap {
     method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
     method public int getConfig();
@@ -1197,9 +1191,6 @@
     property public final long size;
   }
 
-  public final class CanvasDrawScopeKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ContentDrawScope extends androidx.compose.ui.graphics.drawscope.DrawScope {
     method public void drawContent();
   }
@@ -1324,13 +1315,6 @@
 
 }
 
-package androidx.compose.ui.graphics.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.graphics.painter {
 
   public final class BitmapPainter extends androidx.compose.ui.graphics.painter.Painter {
@@ -1676,9 +1660,6 @@
     property public final float y;
   }
 
-  public final class PathNodeKt {
-  }
-
   public final class PathParser {
     ctor public PathParser();
     method public androidx.compose.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> nodes);
diff --git a/compose/ui/ui-test-junit4/api/1.4.0-beta01.txt b/compose/ui/ui-test-junit4/api/1.4.0-beta01.txt
index fa23fb8eb..1da7d1c 100644
--- a/compose/ui/ui-test-junit4/api/1.4.0-beta01.txt
+++ b/compose/ui/ui-test-junit4/api/1.4.0-beta01.txt
@@ -46,19 +46,10 @@
     method public static androidx.compose.ui.test.junit4.ComposeTestRule createEmptyComposeRule();
   }
 
-  public final class AndroidSynchronization_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComposeContentTestRule extends androidx.compose.ui.test.junit4.ComposeTestRule {
     method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
   }
 
-  public final class ComposeIdlingResource_androidKt {
-  }
-
-  public final class ComposeRootRegistry_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComposeTestRule extends org.junit.rules.TestRule androidx.compose.ui.test.SemanticsNodeInteractionsProvider {
     method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public androidx.compose.ui.unit.Density getDensity();
@@ -73,9 +64,6 @@
     property public abstract androidx.compose.ui.test.MainTestClock mainClock;
   }
 
-  public final class EspressoLink_androidKt {
-  }
-
   public final class StateRestorationTester {
     ctor public StateRestorationTester(androidx.compose.ui.test.junit4.ComposeContentTestRule composeTestRule);
     method public void emulateSavedInstanceStateRestore();
diff --git a/compose/ui/ui-test-junit4/api/current.ignore b/compose/ui/ui-test-junit4/api/current.ignore
new file mode 100644
index 0000000..c08823f
--- /dev/null
+++ b/compose/ui/ui-test-junit4/api/current.ignore
@@ -0,0 +1,9 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.ui.test.junit4.AndroidSynchronization_androidKt:
+    Removed class androidx.compose.ui.test.junit4.AndroidSynchronization_androidKt
+RemovedClass: androidx.compose.ui.test.junit4.ComposeIdlingResource_androidKt:
+    Removed class androidx.compose.ui.test.junit4.ComposeIdlingResource_androidKt
+RemovedClass: androidx.compose.ui.test.junit4.ComposeRootRegistry_androidKt:
+    Removed class androidx.compose.ui.test.junit4.ComposeRootRegistry_androidKt
+RemovedClass: androidx.compose.ui.test.junit4.EspressoLink_androidKt:
+    Removed class androidx.compose.ui.test.junit4.EspressoLink_androidKt
diff --git a/compose/ui/ui-test-junit4/api/current.txt b/compose/ui/ui-test-junit4/api/current.txt
index fa23fb8eb..1da7d1c 100644
--- a/compose/ui/ui-test-junit4/api/current.txt
+++ b/compose/ui/ui-test-junit4/api/current.txt
@@ -46,19 +46,10 @@
     method public static androidx.compose.ui.test.junit4.ComposeTestRule createEmptyComposeRule();
   }
 
-  public final class AndroidSynchronization_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComposeContentTestRule extends androidx.compose.ui.test.junit4.ComposeTestRule {
     method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
   }
 
-  public final class ComposeIdlingResource_androidKt {
-  }
-
-  public final class ComposeRootRegistry_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComposeTestRule extends org.junit.rules.TestRule androidx.compose.ui.test.SemanticsNodeInteractionsProvider {
     method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public androidx.compose.ui.unit.Density getDensity();
@@ -73,9 +64,6 @@
     property public abstract androidx.compose.ui.test.MainTestClock mainClock;
   }
 
-  public final class EspressoLink_androidKt {
-  }
-
   public final class StateRestorationTester {
     ctor public StateRestorationTester(androidx.compose.ui.test.junit4.ComposeContentTestRule composeTestRule);
     method public void emulateSavedInstanceStateRestore();
diff --git a/compose/ui/ui-test-junit4/api/public_plus_experimental_1.4.0-beta01.txt b/compose/ui/ui-test-junit4/api/public_plus_experimental_1.4.0-beta01.txt
index 850087e..53f3965 100644
--- a/compose/ui/ui-test-junit4/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/ui/ui-test-junit4/api/public_plus_experimental_1.4.0-beta01.txt
@@ -100,19 +100,10 @@
     method @androidx.compose.ui.test.ExperimentalTestApi public static androidx.compose.ui.test.junit4.ComposeTestRule createEmptyComposeRule(optional kotlin.coroutines.CoroutineContext effectContext);
   }
 
-  public final class AndroidSynchronization_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComposeContentTestRule extends androidx.compose.ui.test.junit4.ComposeTestRule {
     method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
   }
 
-  public final class ComposeIdlingResource_androidKt {
-  }
-
-  public final class ComposeRootRegistry_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComposeTestRule extends org.junit.rules.TestRule androidx.compose.ui.test.SemanticsNodeInteractionsProvider {
     method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public androidx.compose.ui.unit.Density getDensity();
@@ -131,9 +122,6 @@
     property public abstract androidx.compose.ui.test.MainTestClock mainClock;
   }
 
-  public final class EspressoLink_androidKt {
-  }
-
   public final class StateRestorationTester {
     ctor public StateRestorationTester(androidx.compose.ui.test.junit4.ComposeContentTestRule composeTestRule);
     method public void emulateSavedInstanceStateRestore();
diff --git a/compose/ui/ui-test-junit4/api/public_plus_experimental_current.txt b/compose/ui/ui-test-junit4/api/public_plus_experimental_current.txt
index 850087e..53f3965 100644
--- a/compose/ui/ui-test-junit4/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-test-junit4/api/public_plus_experimental_current.txt
@@ -100,19 +100,10 @@
     method @androidx.compose.ui.test.ExperimentalTestApi public static androidx.compose.ui.test.junit4.ComposeTestRule createEmptyComposeRule(optional kotlin.coroutines.CoroutineContext effectContext);
   }
 
-  public final class AndroidSynchronization_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComposeContentTestRule extends androidx.compose.ui.test.junit4.ComposeTestRule {
     method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
   }
 
-  public final class ComposeIdlingResource_androidKt {
-  }
-
-  public final class ComposeRootRegistry_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComposeTestRule extends org.junit.rules.TestRule androidx.compose.ui.test.SemanticsNodeInteractionsProvider {
     method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public androidx.compose.ui.unit.Density getDensity();
@@ -131,9 +122,6 @@
     property public abstract androidx.compose.ui.test.MainTestClock mainClock;
   }
 
-  public final class EspressoLink_androidKt {
-  }
-
   public final class StateRestorationTester {
     ctor public StateRestorationTester(androidx.compose.ui.test.junit4.ComposeContentTestRule composeTestRule);
     method public void emulateSavedInstanceStateRestore();
diff --git a/compose/ui/ui-test-junit4/api/restricted_1.4.0-beta01.txt b/compose/ui/ui-test-junit4/api/restricted_1.4.0-beta01.txt
index fa23fb8eb..1da7d1c 100644
--- a/compose/ui/ui-test-junit4/api/restricted_1.4.0-beta01.txt
+++ b/compose/ui/ui-test-junit4/api/restricted_1.4.0-beta01.txt
@@ -46,19 +46,10 @@
     method public static androidx.compose.ui.test.junit4.ComposeTestRule createEmptyComposeRule();
   }
 
-  public final class AndroidSynchronization_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComposeContentTestRule extends androidx.compose.ui.test.junit4.ComposeTestRule {
     method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
   }
 
-  public final class ComposeIdlingResource_androidKt {
-  }
-
-  public final class ComposeRootRegistry_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComposeTestRule extends org.junit.rules.TestRule androidx.compose.ui.test.SemanticsNodeInteractionsProvider {
     method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public androidx.compose.ui.unit.Density getDensity();
@@ -73,9 +64,6 @@
     property public abstract androidx.compose.ui.test.MainTestClock mainClock;
   }
 
-  public final class EspressoLink_androidKt {
-  }
-
   public final class StateRestorationTester {
     ctor public StateRestorationTester(androidx.compose.ui.test.junit4.ComposeContentTestRule composeTestRule);
     method public void emulateSavedInstanceStateRestore();
diff --git a/compose/ui/ui-test-junit4/api/restricted_current.ignore b/compose/ui/ui-test-junit4/api/restricted_current.ignore
new file mode 100644
index 0000000..c08823f
--- /dev/null
+++ b/compose/ui/ui-test-junit4/api/restricted_current.ignore
@@ -0,0 +1,9 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.ui.test.junit4.AndroidSynchronization_androidKt:
+    Removed class androidx.compose.ui.test.junit4.AndroidSynchronization_androidKt
+RemovedClass: androidx.compose.ui.test.junit4.ComposeIdlingResource_androidKt:
+    Removed class androidx.compose.ui.test.junit4.ComposeIdlingResource_androidKt
+RemovedClass: androidx.compose.ui.test.junit4.ComposeRootRegistry_androidKt:
+    Removed class androidx.compose.ui.test.junit4.ComposeRootRegistry_androidKt
+RemovedClass: androidx.compose.ui.test.junit4.EspressoLink_androidKt:
+    Removed class androidx.compose.ui.test.junit4.EspressoLink_androidKt
diff --git a/compose/ui/ui-test-junit4/api/restricted_current.txt b/compose/ui/ui-test-junit4/api/restricted_current.txt
index fa23fb8eb..1da7d1c 100644
--- a/compose/ui/ui-test-junit4/api/restricted_current.txt
+++ b/compose/ui/ui-test-junit4/api/restricted_current.txt
@@ -46,19 +46,10 @@
     method public static androidx.compose.ui.test.junit4.ComposeTestRule createEmptyComposeRule();
   }
 
-  public final class AndroidSynchronization_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComposeContentTestRule extends androidx.compose.ui.test.junit4.ComposeTestRule {
     method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
   }
 
-  public final class ComposeIdlingResource_androidKt {
-  }
-
-  public final class ComposeRootRegistry_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComposeTestRule extends org.junit.rules.TestRule androidx.compose.ui.test.SemanticsNodeInteractionsProvider {
     method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public androidx.compose.ui.unit.Density getDensity();
@@ -73,9 +64,6 @@
     property public abstract androidx.compose.ui.test.MainTestClock mainClock;
   }
 
-  public final class EspressoLink_androidKt {
-  }
-
   public final class StateRestorationTester {
     ctor public StateRestorationTester(androidx.compose.ui.test.junit4.ComposeContentTestRule composeTestRule);
     method public void emulateSavedInstanceStateRestore();
diff --git a/compose/ui/ui-test/api/1.4.0-beta01.txt b/compose/ui/ui-test/api/1.4.0-beta01.txt
index bd6bf9d..ccf02da 100644
--- a/compose/ui/ui-test/api/1.4.0-beta01.txt
+++ b/compose/ui/ui-test/api/1.4.0-beta01.txt
@@ -16,22 +16,10 @@
     method public static androidx.compose.ui.test.SemanticsNodeInteraction performTouchInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit> block);
   }
 
-  public final class Actions_androidKt {
-  }
-
-  public final class AndroidAssertions_androidKt {
-  }
-
   public final class AndroidImageHelpers_androidKt {
     method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.ImageBitmap captureToImage(androidx.compose.ui.test.SemanticsNodeInteraction);
   }
 
-  public final class AndroidInputDispatcher_androidKt {
-  }
-
-  public final class AndroidOutput_androidKt {
-  }
-
   public final class AssertionsKt {
     method public static androidx.compose.ui.test.SemanticsNodeInteraction assert(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher, optional kotlin.jvm.functions.Function0<java.lang.String>? messagePrefixOnError);
     method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAll(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
@@ -79,12 +67,6 @@
     ctor public ComposeTimeoutException(String? message);
   }
 
-  public final class ErrorMessagesKt {
-  }
-
-  public final class Expect_jvmKt {
-  }
-
   public final class FiltersKt {
     method public static androidx.compose.ui.test.SemanticsMatcher hasAnyAncestor(androidx.compose.ui.test.SemanticsMatcher matcher);
     method public static androidx.compose.ui.test.SemanticsMatcher hasAnyChild(androidx.compose.ui.test.SemanticsMatcher matcher);
@@ -333,9 +315,6 @@
     property public final String description;
   }
 
-  public final class SemanticsSelectorKt {
-  }
-
   public final class TestContext {
   }
 
@@ -381,22 +360,5 @@
     method public static void swipeWithVelocity(androidx.compose.ui.test.TouchInjectionScope, long start, long end, float endVelocity, optional long durationMillis);
   }
 
-  public final class UtilsKt {
-  }
-
-}
-
-package androidx.compose.ui.test.android {
-
-  public final class WindowCapture_androidKt {
-  }
-
-}
-
-package androidx.compose.ui.test.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-test/api/current.ignore b/compose/ui/ui-test/api/current.ignore
new file mode 100644
index 0000000..a99da50
--- /dev/null
+++ b/compose/ui/ui-test/api/current.ignore
@@ -0,0 +1,23 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.ui.test.Actions_androidKt:
+    Removed class androidx.compose.ui.test.Actions_androidKt
+RemovedClass: androidx.compose.ui.test.AndroidAssertions_androidKt:
+    Removed class androidx.compose.ui.test.AndroidAssertions_androidKt
+RemovedClass: androidx.compose.ui.test.AndroidInputDispatcher_androidKt:
+    Removed class androidx.compose.ui.test.AndroidInputDispatcher_androidKt
+RemovedClass: androidx.compose.ui.test.AndroidOutput_androidKt:
+    Removed class androidx.compose.ui.test.AndroidOutput_androidKt
+RemovedClass: androidx.compose.ui.test.ErrorMessagesKt:
+    Removed class androidx.compose.ui.test.ErrorMessagesKt
+RemovedClass: androidx.compose.ui.test.Expect_jvmKt:
+    Removed class androidx.compose.ui.test.Expect_jvmKt
+RemovedClass: androidx.compose.ui.test.SemanticsSelectorKt:
+    Removed class androidx.compose.ui.test.SemanticsSelectorKt
+RemovedClass: androidx.compose.ui.test.UtilsKt:
+    Removed class androidx.compose.ui.test.UtilsKt
+
+
+RemovedPackage: androidx.compose.ui.test.android:
+    Removed package androidx.compose.ui.test.android
+RemovedPackage: androidx.compose.ui.test.internal:
+    Removed package androidx.compose.ui.test.internal
diff --git a/compose/ui/ui-test/api/current.txt b/compose/ui/ui-test/api/current.txt
index bd6bf9d..ccf02da 100644
--- a/compose/ui/ui-test/api/current.txt
+++ b/compose/ui/ui-test/api/current.txt
@@ -16,22 +16,10 @@
     method public static androidx.compose.ui.test.SemanticsNodeInteraction performTouchInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit> block);
   }
 
-  public final class Actions_androidKt {
-  }
-
-  public final class AndroidAssertions_androidKt {
-  }
-
   public final class AndroidImageHelpers_androidKt {
     method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.ImageBitmap captureToImage(androidx.compose.ui.test.SemanticsNodeInteraction);
   }
 
-  public final class AndroidInputDispatcher_androidKt {
-  }
-
-  public final class AndroidOutput_androidKt {
-  }
-
   public final class AssertionsKt {
     method public static androidx.compose.ui.test.SemanticsNodeInteraction assert(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher, optional kotlin.jvm.functions.Function0<java.lang.String>? messagePrefixOnError);
     method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAll(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
@@ -79,12 +67,6 @@
     ctor public ComposeTimeoutException(String? message);
   }
 
-  public final class ErrorMessagesKt {
-  }
-
-  public final class Expect_jvmKt {
-  }
-
   public final class FiltersKt {
     method public static androidx.compose.ui.test.SemanticsMatcher hasAnyAncestor(androidx.compose.ui.test.SemanticsMatcher matcher);
     method public static androidx.compose.ui.test.SemanticsMatcher hasAnyChild(androidx.compose.ui.test.SemanticsMatcher matcher);
@@ -333,9 +315,6 @@
     property public final String description;
   }
 
-  public final class SemanticsSelectorKt {
-  }
-
   public final class TestContext {
   }
 
@@ -381,22 +360,5 @@
     method public static void swipeWithVelocity(androidx.compose.ui.test.TouchInjectionScope, long start, long end, float endVelocity, optional long durationMillis);
   }
 
-  public final class UtilsKt {
-  }
-
-}
-
-package androidx.compose.ui.test.android {
-
-  public final class WindowCapture_androidKt {
-  }
-
-}
-
-package androidx.compose.ui.test.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-test/api/public_plus_experimental_1.4.0-beta01.txt b/compose/ui/ui-test/api/public_plus_experimental_1.4.0-beta01.txt
index b8e19f7..625ea2f 100644
--- a/compose/ui/ui-test/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/ui/ui-test/api/public_plus_experimental_1.4.0-beta01.txt
@@ -19,22 +19,10 @@
     method public static androidx.compose.ui.test.SemanticsNodeInteraction performTouchInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit> block);
   }
 
-  public final class Actions_androidKt {
-  }
-
-  public final class AndroidAssertions_androidKt {
-  }
-
   public final class AndroidImageHelpers_androidKt {
     method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.ImageBitmap captureToImage(androidx.compose.ui.test.SemanticsNodeInteraction);
   }
 
-  public final class AndroidInputDispatcher_androidKt {
-  }
-
-  public final class AndroidOutput_androidKt {
-  }
-
   public final class AssertionsKt {
     method public static androidx.compose.ui.test.SemanticsNodeInteraction assert(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher, optional kotlin.jvm.functions.Function0<java.lang.String>? messagePrefixOnError);
     method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAll(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
@@ -82,12 +70,6 @@
     ctor public ComposeTimeoutException(String? message);
   }
 
-  public final class ErrorMessagesKt {
-  }
-
-  public final class Expect_jvmKt {
-  }
-
   @kotlin.RequiresOptIn(message="This testing API is experimental and is likely to be changed or removed entirely") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalTestApi {
   }
 
@@ -431,9 +413,6 @@
     property public final String description;
   }
 
-  public final class SemanticsSelectorKt {
-  }
-
   public final class TestContext {
   }
 
@@ -505,16 +484,6 @@
     method public static void swipeWithVelocity(androidx.compose.ui.test.TouchInjectionScope, long start, long end, float endVelocity, optional long durationMillis);
   }
 
-  public final class UtilsKt {
-  }
-
-}
-
-package androidx.compose.ui.test.android {
-
-  public final class WindowCapture_androidKt {
-  }
-
 }
 
 package androidx.compose.ui.test.internal {
@@ -523,8 +492,5 @@
     ctor public DelayPropagatingContinuationInterceptorWrapper(kotlin.coroutines.ContinuationInterceptor? wrappedInterceptor);
   }
 
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-test/api/public_plus_experimental_current.txt b/compose/ui/ui-test/api/public_plus_experimental_current.txt
index b8e19f7..625ea2f 100644
--- a/compose/ui/ui-test/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-test/api/public_plus_experimental_current.txt
@@ -19,22 +19,10 @@
     method public static androidx.compose.ui.test.SemanticsNodeInteraction performTouchInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit> block);
   }
 
-  public final class Actions_androidKt {
-  }
-
-  public final class AndroidAssertions_androidKt {
-  }
-
   public final class AndroidImageHelpers_androidKt {
     method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.ImageBitmap captureToImage(androidx.compose.ui.test.SemanticsNodeInteraction);
   }
 
-  public final class AndroidInputDispatcher_androidKt {
-  }
-
-  public final class AndroidOutput_androidKt {
-  }
-
   public final class AssertionsKt {
     method public static androidx.compose.ui.test.SemanticsNodeInteraction assert(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher, optional kotlin.jvm.functions.Function0<java.lang.String>? messagePrefixOnError);
     method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAll(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
@@ -82,12 +70,6 @@
     ctor public ComposeTimeoutException(String? message);
   }
 
-  public final class ErrorMessagesKt {
-  }
-
-  public final class Expect_jvmKt {
-  }
-
   @kotlin.RequiresOptIn(message="This testing API is experimental and is likely to be changed or removed entirely") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalTestApi {
   }
 
@@ -431,9 +413,6 @@
     property public final String description;
   }
 
-  public final class SemanticsSelectorKt {
-  }
-
   public final class TestContext {
   }
 
@@ -505,16 +484,6 @@
     method public static void swipeWithVelocity(androidx.compose.ui.test.TouchInjectionScope, long start, long end, float endVelocity, optional long durationMillis);
   }
 
-  public final class UtilsKt {
-  }
-
-}
-
-package androidx.compose.ui.test.android {
-
-  public final class WindowCapture_androidKt {
-  }
-
 }
 
 package androidx.compose.ui.test.internal {
@@ -523,8 +492,5 @@
     ctor public DelayPropagatingContinuationInterceptorWrapper(kotlin.coroutines.ContinuationInterceptor? wrappedInterceptor);
   }
 
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-test/api/restricted_1.4.0-beta01.txt b/compose/ui/ui-test/api/restricted_1.4.0-beta01.txt
index 1cb6dfa..24df72e 100644
--- a/compose/ui/ui-test/api/restricted_1.4.0-beta01.txt
+++ b/compose/ui/ui-test/api/restricted_1.4.0-beta01.txt
@@ -16,22 +16,10 @@
     method public static androidx.compose.ui.test.SemanticsNodeInteraction performTouchInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit> block);
   }
 
-  public final class Actions_androidKt {
-  }
-
-  public final class AndroidAssertions_androidKt {
-  }
-
   public final class AndroidImageHelpers_androidKt {
     method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.ImageBitmap captureToImage(androidx.compose.ui.test.SemanticsNodeInteraction);
   }
 
-  public final class AndroidInputDispatcher_androidKt {
-  }
-
-  public final class AndroidOutput_androidKt {
-  }
-
   public final class AssertionsKt {
     method public static androidx.compose.ui.test.SemanticsNodeInteraction assert(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher, optional kotlin.jvm.functions.Function0<java.lang.String>? messagePrefixOnError);
     method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAll(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
@@ -79,12 +67,6 @@
     ctor public ComposeTimeoutException(String? message);
   }
 
-  public final class ErrorMessagesKt {
-  }
-
-  public final class Expect_jvmKt {
-  }
-
   public final class FiltersKt {
     method public static androidx.compose.ui.test.SemanticsMatcher hasAnyAncestor(androidx.compose.ui.test.SemanticsMatcher matcher);
     method public static androidx.compose.ui.test.SemanticsMatcher hasAnyChild(androidx.compose.ui.test.SemanticsMatcher matcher);
@@ -334,9 +316,6 @@
     property public final String description;
   }
 
-  public final class SemanticsSelectorKt {
-  }
-
   public final class TestContext {
   }
 
@@ -382,22 +361,5 @@
     method public static void swipeWithVelocity(androidx.compose.ui.test.TouchInjectionScope, long start, long end, float endVelocity, optional long durationMillis);
   }
 
-  public final class UtilsKt {
-  }
-
-}
-
-package androidx.compose.ui.test.android {
-
-  public final class WindowCapture_androidKt {
-  }
-
-}
-
-package androidx.compose.ui.test.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-test/api/restricted_current.ignore b/compose/ui/ui-test/api/restricted_current.ignore
new file mode 100644
index 0000000..a99da50
--- /dev/null
+++ b/compose/ui/ui-test/api/restricted_current.ignore
@@ -0,0 +1,23 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.ui.test.Actions_androidKt:
+    Removed class androidx.compose.ui.test.Actions_androidKt
+RemovedClass: androidx.compose.ui.test.AndroidAssertions_androidKt:
+    Removed class androidx.compose.ui.test.AndroidAssertions_androidKt
+RemovedClass: androidx.compose.ui.test.AndroidInputDispatcher_androidKt:
+    Removed class androidx.compose.ui.test.AndroidInputDispatcher_androidKt
+RemovedClass: androidx.compose.ui.test.AndroidOutput_androidKt:
+    Removed class androidx.compose.ui.test.AndroidOutput_androidKt
+RemovedClass: androidx.compose.ui.test.ErrorMessagesKt:
+    Removed class androidx.compose.ui.test.ErrorMessagesKt
+RemovedClass: androidx.compose.ui.test.Expect_jvmKt:
+    Removed class androidx.compose.ui.test.Expect_jvmKt
+RemovedClass: androidx.compose.ui.test.SemanticsSelectorKt:
+    Removed class androidx.compose.ui.test.SemanticsSelectorKt
+RemovedClass: androidx.compose.ui.test.UtilsKt:
+    Removed class androidx.compose.ui.test.UtilsKt
+
+
+RemovedPackage: androidx.compose.ui.test.android:
+    Removed package androidx.compose.ui.test.android
+RemovedPackage: androidx.compose.ui.test.internal:
+    Removed package androidx.compose.ui.test.internal
diff --git a/compose/ui/ui-test/api/restricted_current.txt b/compose/ui/ui-test/api/restricted_current.txt
index 1cb6dfa..24df72e 100644
--- a/compose/ui/ui-test/api/restricted_current.txt
+++ b/compose/ui/ui-test/api/restricted_current.txt
@@ -16,22 +16,10 @@
     method public static androidx.compose.ui.test.SemanticsNodeInteraction performTouchInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit> block);
   }
 
-  public final class Actions_androidKt {
-  }
-
-  public final class AndroidAssertions_androidKt {
-  }
-
   public final class AndroidImageHelpers_androidKt {
     method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.ImageBitmap captureToImage(androidx.compose.ui.test.SemanticsNodeInteraction);
   }
 
-  public final class AndroidInputDispatcher_androidKt {
-  }
-
-  public final class AndroidOutput_androidKt {
-  }
-
   public final class AssertionsKt {
     method public static androidx.compose.ui.test.SemanticsNodeInteraction assert(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher, optional kotlin.jvm.functions.Function0<java.lang.String>? messagePrefixOnError);
     method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAll(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
@@ -79,12 +67,6 @@
     ctor public ComposeTimeoutException(String? message);
   }
 
-  public final class ErrorMessagesKt {
-  }
-
-  public final class Expect_jvmKt {
-  }
-
   public final class FiltersKt {
     method public static androidx.compose.ui.test.SemanticsMatcher hasAnyAncestor(androidx.compose.ui.test.SemanticsMatcher matcher);
     method public static androidx.compose.ui.test.SemanticsMatcher hasAnyChild(androidx.compose.ui.test.SemanticsMatcher matcher);
@@ -334,9 +316,6 @@
     property public final String description;
   }
 
-  public final class SemanticsSelectorKt {
-  }
-
   public final class TestContext {
   }
 
@@ -382,22 +361,5 @@
     method public static void swipeWithVelocity(androidx.compose.ui.test.TouchInjectionScope, long start, long end, float endVelocity, optional long durationMillis);
   }
 
-  public final class UtilsKt {
-  }
-
-}
-
-package androidx.compose.ui.test.android {
-
-  public final class WindowCapture_androidKt {
-  }
-
-}
-
-package androidx.compose.ui.test.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-text-google-fonts/api/1.4.0-beta01.txt b/compose/ui/ui-text-google-fonts/api/1.4.0-beta01.txt
index 5bcabac..b93d5c2 100644
--- a/compose/ui/ui-text-google-fonts/api/1.4.0-beta01.txt
+++ b/compose/ui/ui-text-google-fonts/api/1.4.0-beta01.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.ui.text.googlefonts {
 
-  public final class FontProviderHelperKt {
-  }
-
   public final class GoogleFont {
     ctor public GoogleFont(String name, optional boolean bestEffort);
     method public boolean getBestEffort();
diff --git a/compose/ui/ui-text-google-fonts/api/current.ignore b/compose/ui/ui-text-google-fonts/api/current.ignore
new file mode 100644
index 0000000..9c78ac5
--- /dev/null
+++ b/compose/ui/ui-text-google-fonts/api/current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.ui.text.googlefonts.FontProviderHelperKt:
+    Removed class androidx.compose.ui.text.googlefonts.FontProviderHelperKt
diff --git a/compose/ui/ui-text-google-fonts/api/current.txt b/compose/ui/ui-text-google-fonts/api/current.txt
index 5bcabac..b93d5c2 100644
--- a/compose/ui/ui-text-google-fonts/api/current.txt
+++ b/compose/ui/ui-text-google-fonts/api/current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.ui.text.googlefonts {
 
-  public final class FontProviderHelperKt {
-  }
-
   public final class GoogleFont {
     ctor public GoogleFont(String name, optional boolean bestEffort);
     method public boolean getBestEffort();
diff --git a/compose/ui/ui-text-google-fonts/api/public_plus_experimental_1.4.0-beta01.txt b/compose/ui/ui-text-google-fonts/api/public_plus_experimental_1.4.0-beta01.txt
index 5bcabac..b93d5c2 100644
--- a/compose/ui/ui-text-google-fonts/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/ui/ui-text-google-fonts/api/public_plus_experimental_1.4.0-beta01.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.ui.text.googlefonts {
 
-  public final class FontProviderHelperKt {
-  }
-
   public final class GoogleFont {
     ctor public GoogleFont(String name, optional boolean bestEffort);
     method public boolean getBestEffort();
diff --git a/compose/ui/ui-text-google-fonts/api/public_plus_experimental_current.txt b/compose/ui/ui-text-google-fonts/api/public_plus_experimental_current.txt
index 5bcabac..b93d5c2 100644
--- a/compose/ui/ui-text-google-fonts/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-text-google-fonts/api/public_plus_experimental_current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.ui.text.googlefonts {
 
-  public final class FontProviderHelperKt {
-  }
-
   public final class GoogleFont {
     ctor public GoogleFont(String name, optional boolean bestEffort);
     method public boolean getBestEffort();
diff --git a/compose/ui/ui-text-google-fonts/api/restricted_1.4.0-beta01.txt b/compose/ui/ui-text-google-fonts/api/restricted_1.4.0-beta01.txt
index 5bcabac..b93d5c2 100644
--- a/compose/ui/ui-text-google-fonts/api/restricted_1.4.0-beta01.txt
+++ b/compose/ui/ui-text-google-fonts/api/restricted_1.4.0-beta01.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.ui.text.googlefonts {
 
-  public final class FontProviderHelperKt {
-  }
-
   public final class GoogleFont {
     ctor public GoogleFont(String name, optional boolean bestEffort);
     method public boolean getBestEffort();
diff --git a/compose/ui/ui-text-google-fonts/api/restricted_current.ignore b/compose/ui/ui-text-google-fonts/api/restricted_current.ignore
new file mode 100644
index 0000000..9c78ac5
--- /dev/null
+++ b/compose/ui/ui-text-google-fonts/api/restricted_current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.ui.text.googlefonts.FontProviderHelperKt:
+    Removed class androidx.compose.ui.text.googlefonts.FontProviderHelperKt
diff --git a/compose/ui/ui-text-google-fonts/api/restricted_current.txt b/compose/ui/ui-text-google-fonts/api/restricted_current.txt
index 5bcabac..b93d5c2 100644
--- a/compose/ui/ui-text-google-fonts/api/restricted_current.txt
+++ b/compose/ui/ui-text-google-fonts/api/restricted_current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.ui.text.googlefonts {
 
-  public final class FontProviderHelperKt {
-  }
-
   public final class GoogleFont {
     ctor public GoogleFont(String name, optional boolean bestEffort);
     method public boolean getBestEffort();
diff --git a/compose/ui/ui-text/api/1.4.0-beta01.txt b/compose/ui/ui-text/api/1.4.0-beta01.txt
index 8fc4fc2..1c59a83 100644
--- a/compose/ui/ui-text/api/1.4.0-beta01.txt
+++ b/compose/ui/ui-text/api/1.4.0-beta01.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.ui.text {
 
-  public final class ActualAtomicReferenceJvmKt {
-  }
-
-  public final class AndroidParagraph_androidKt {
-  }
-
   public final class AndroidTextStyle_androidKt {
     method public static androidx.compose.ui.text.PlatformParagraphStyle lerp(androidx.compose.ui.text.PlatformParagraphStyle start, androidx.compose.ui.text.PlatformParagraphStyle stop, float fraction);
     method public static androidx.compose.ui.text.PlatformSpanStyle lerp(androidx.compose.ui.text.PlatformSpanStyle start, androidx.compose.ui.text.PlatformSpanStyle stop, float fraction);
@@ -98,12 +92,6 @@
     property public final int None;
   }
 
-  public final class JvmAnnotatedString_jvmKt {
-  }
-
-  public final class JvmCharHelpers_androidKt {
-  }
-
   public final class MultiParagraph {
     ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, long constraints, optional int maxLines, optional boolean ellipsis);
     ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, optional int maxLines, optional boolean ellipsis, float width);
@@ -168,12 +156,6 @@
     property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
   }
 
-  public final class MultiParagraphIntrinsicsKt {
-  }
-
-  public final class MultiParagraphKt {
-  }
-
   public sealed interface Paragraph {
     method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
     method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
@@ -338,9 +320,6 @@
     property public final androidx.compose.ui.text.PlatformSpanStyle? spanStyle;
   }
 
-  public final class SaversKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SpanStyle {
     ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
     ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
@@ -395,9 +374,6 @@
     method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
   }
 
-  public final class TempListUtilsKt {
-  }
-
   public final class TextLayoutInput {
     ctor @Deprecated public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, long constraints);
     ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, long constraints);
@@ -468,9 +444,6 @@
     property public final long size;
   }
 
-  public final class TextMeasurerKt {
-  }
-
   public final class TextPainter {
     method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
     field public static final androidx.compose.ui.text.TextPainter INSTANCE;
@@ -600,50 +573,6 @@
   public final class LayoutCompatKt {
   }
 
-  public final class LayoutHelperKt {
-  }
-
-  public final class LayoutIntrinsicsKt {
-  }
-
-  public final class PaintExtensionsKt {
-  }
-
-  public final class SpannedExtensionsKt {
-  }
-
-  public final class StaticLayoutFactoryKt {
-  }
-
-  public final class TempListUtilsKt {
-  }
-
-  public final class TextLayoutKt {
-  }
-
-}
-
-package androidx.compose.ui.text.android.style {
-
-  public final class IndentationFixSpanKt {
-  }
-
-  public final class LineHeightStyleSpanKt {
-  }
-
-  public final class PlaceholderSpanKt {
-  }
-
-}
-
-package androidx.compose.ui.text.caches {
-
-  public final class ContainerHelpersKt {
-  }
-
-  public final class SimpleArrayMapKt {
-  }
-
 }
 
 package androidx.compose.ui.text.font {
@@ -670,15 +599,6 @@
     method @RequiresApi(26) @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font Font(android.os.ParcelFileDescriptor fileDescriptor, optional androidx.compose.ui.text.font.FontWeight weight, optional int style, optional androidx.compose.ui.text.font.FontVariation.Settings variationSettings);
   }
 
-  public final class AndroidFontLoader_androidKt {
-  }
-
-  public final class AndroidFontResolveInterceptor_androidKt {
-  }
-
-  public final class AndroidFontUtils_androidKt {
-  }
-
   public final class AndroidTypeface_androidKt {
     method public static androidx.compose.ui.text.font.FontFamily FontFamily(android.graphics.Typeface typeface);
     method @Deprecated public static androidx.compose.ui.text.font.Typeface Typeface(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, optional java.util.List<kotlin.Pair<androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontStyle>>? styles);
@@ -751,9 +671,6 @@
     method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Typeface typeface);
   }
 
-  public final class FontFamilyResolverKt {
-  }
-
   public final class FontFamilyResolver_androidKt {
     method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context);
     method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context, kotlin.coroutines.CoroutineContext coroutineContext);
@@ -771,9 +688,6 @@
     property public final java.util.List<androidx.compose.ui.text.font.Font> fonts;
   }
 
-  public final class FontListFontFamilyTypefaceAdapterKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class FontLoadingStrategy {
     method public int getValue();
     property public final int value;
@@ -819,9 +733,6 @@
     property public final int Weight;
   }
 
-  public final class FontSynthesis_androidKt {
-  }
-
   public final class FontVariation {
     method public androidx.compose.ui.text.font.FontVariation.Setting Setting(String name, float value);
     method public androidx.compose.ui.text.font.FontVariation.Settings Settings(androidx.compose.ui.text.font.FontWeight weight, int style, androidx.compose.ui.text.font.FontVariation.Setting... settings);
@@ -909,9 +820,6 @@
     property public final androidx.compose.ui.text.font.Typeface typeface;
   }
 
-  public final class PlatformTypefacesKt {
-  }
-
   public final class ResourceFont implements androidx.compose.ui.text.font.Font {
     method public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
     method public int getResId();
@@ -978,9 +886,6 @@
     method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
   }
 
-  public final class EditCommandKt {
-  }
-
   public final class EditProcessor {
     ctor public EditProcessor();
     method public androidx.compose.ui.text.input.TextFieldValue apply(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
@@ -992,20 +897,11 @@
     ctor public EditingBuffer(androidx.compose.ui.text.AnnotatedString text, long selection);
   }
 
-  public final class EditingBufferKt {
-  }
-
   public final class FinishComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
     ctor public FinishComposingTextCommand();
     method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
   }
 
-  public final class GapBufferKt {
-  }
-
-  public final class GapBuffer_jvmKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class ImeAction {
     field public static final androidx.compose.ui.text.input.ImeAction.Companion Companion;
   }
@@ -1225,18 +1121,8 @@
 
 }
 
-package androidx.compose.ui.text.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.text.intl {
 
-  public final class AndroidPlatformLocale_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class Locale {
     ctor public Locale(String languageTag);
     method public String getLanguage();
@@ -1275,9 +1161,6 @@
     property public final androidx.compose.ui.text.intl.LocaleList current;
   }
 
-  public final class PlatformLocaleKt {
-  }
-
 }
 
 package androidx.compose.ui.text.platform {
@@ -1285,46 +1168,10 @@
   public final class AndroidAccessibilitySpannableString_androidKt {
   }
 
-  public final class AndroidMultiParagraphDrawKt {
-  }
-
-  public final class AndroidParagraphHelper_androidKt {
-  }
-
-  public final class AndroidParagraphIntrinsics_androidKt {
-  }
-
-  public final class AndroidParagraph_androidKt {
-  }
-
-  public final class AndroidStringDelegate_androidKt {
-  }
-
-  public final class AndroidTextPaint_androidKt {
-  }
-
-  public final class EmojiCompatStatusKt {
-  }
-
-  public final class Synchronization_jvmKt {
-  }
-
 }
 
 package androidx.compose.ui.text.platform.extensions {
 
-  public final class LocaleExtensions_androidKt {
-  }
-
-  public final class PlaceholderExtensions_androidKt {
-  }
-
-  public final class SpannableExtensions_androidKt {
-  }
-
-  public final class TextPaintExtensions_androidKt {
-  }
-
   public final class TtsAnnotationExtensions_androidKt {
     method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.TtsAnnotation);
     method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.VerbatimTtsAnnotation);
@@ -1428,9 +1275,6 @@
     property public final int Phrase;
   }
 
-  public final class LineBreak_androidKt {
-  }
-
   public final class LineHeightStyle {
     ctor public LineHeightStyle(float alignment, int trim);
     method public float getAlignment();
@@ -1537,9 +1381,6 @@
     property public final int Rtl;
   }
 
-  public final class TextDrawStyleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class TextGeometricTransform {
     ctor public TextGeometricTransform(optional float scaleX, optional float skewX);
     method public androidx.compose.ui.text.style.TextGeometricTransform copy(optional float scaleX, optional float skewX);
diff --git a/compose/ui/ui-text/api/current.ignore b/compose/ui/ui-text/api/current.ignore
index 24501fb..1ecda6d 100644
--- a/compose/ui/ui-text/api/current.ignore
+++ b/compose/ui/ui-text/api/current.ignore
@@ -1,3 +1,95 @@
 // Baseline format: 1.0
 ChangedType: androidx.compose.ui.text.AnnotatedString.Builder#append(char):
     Method androidx.compose.ui.text.AnnotatedString.Builder.append has changed return type from void to androidx.compose.ui.text.AnnotatedString.Builder
+
+
+RemovedClass: androidx.compose.ui.text.ActualAtomicReferenceJvmKt:
+    Removed class androidx.compose.ui.text.ActualAtomicReferenceJvmKt
+RemovedClass: androidx.compose.ui.text.AndroidParagraph_androidKt:
+    Removed class androidx.compose.ui.text.AndroidParagraph_androidKt
+RemovedClass: androidx.compose.ui.text.JvmAnnotatedString_jvmKt:
+    Removed class androidx.compose.ui.text.JvmAnnotatedString_jvmKt
+RemovedClass: androidx.compose.ui.text.JvmCharHelpers_androidKt:
+    Removed class androidx.compose.ui.text.JvmCharHelpers_androidKt
+RemovedClass: androidx.compose.ui.text.MultiParagraphIntrinsicsKt:
+    Removed class androidx.compose.ui.text.MultiParagraphIntrinsicsKt
+RemovedClass: androidx.compose.ui.text.MultiParagraphKt:
+    Removed class androidx.compose.ui.text.MultiParagraphKt
+RemovedClass: androidx.compose.ui.text.SaversKt:
+    Removed class androidx.compose.ui.text.SaversKt
+RemovedClass: androidx.compose.ui.text.TempListUtilsKt:
+    Removed class androidx.compose.ui.text.TempListUtilsKt
+RemovedClass: androidx.compose.ui.text.TextMeasurerKt:
+    Removed class androidx.compose.ui.text.TextMeasurerKt
+RemovedClass: androidx.compose.ui.text.android.LayoutHelperKt:
+    Removed class androidx.compose.ui.text.android.LayoutHelperKt
+RemovedClass: androidx.compose.ui.text.android.LayoutIntrinsicsKt:
+    Removed class androidx.compose.ui.text.android.LayoutIntrinsicsKt
+RemovedClass: androidx.compose.ui.text.android.PaintExtensionsKt:
+    Removed class androidx.compose.ui.text.android.PaintExtensionsKt
+RemovedClass: androidx.compose.ui.text.android.SpannedExtensionsKt:
+    Removed class androidx.compose.ui.text.android.SpannedExtensionsKt
+RemovedClass: androidx.compose.ui.text.android.StaticLayoutFactoryKt:
+    Removed class androidx.compose.ui.text.android.StaticLayoutFactoryKt
+RemovedClass: androidx.compose.ui.text.android.TempListUtilsKt:
+    Removed class androidx.compose.ui.text.android.TempListUtilsKt
+RemovedClass: androidx.compose.ui.text.android.TextLayoutKt:
+    Removed class androidx.compose.ui.text.android.TextLayoutKt
+RemovedClass: androidx.compose.ui.text.font.AndroidFontLoader_androidKt:
+    Removed class androidx.compose.ui.text.font.AndroidFontLoader_androidKt
+RemovedClass: androidx.compose.ui.text.font.AndroidFontResolveInterceptor_androidKt:
+    Removed class androidx.compose.ui.text.font.AndroidFontResolveInterceptor_androidKt
+RemovedClass: androidx.compose.ui.text.font.AndroidFontUtils_androidKt:
+    Removed class androidx.compose.ui.text.font.AndroidFontUtils_androidKt
+RemovedClass: androidx.compose.ui.text.font.FontFamilyResolverKt:
+    Removed class androidx.compose.ui.text.font.FontFamilyResolverKt
+RemovedClass: androidx.compose.ui.text.font.FontListFontFamilyTypefaceAdapterKt:
+    Removed class androidx.compose.ui.text.font.FontListFontFamilyTypefaceAdapterKt
+RemovedClass: androidx.compose.ui.text.font.FontSynthesis_androidKt:
+    Removed class androidx.compose.ui.text.font.FontSynthesis_androidKt
+RemovedClass: androidx.compose.ui.text.font.PlatformTypefacesKt:
+    Removed class androidx.compose.ui.text.font.PlatformTypefacesKt
+RemovedClass: androidx.compose.ui.text.input.EditCommandKt:
+    Removed class androidx.compose.ui.text.input.EditCommandKt
+RemovedClass: androidx.compose.ui.text.input.EditingBufferKt:
+    Removed class androidx.compose.ui.text.input.EditingBufferKt
+RemovedClass: androidx.compose.ui.text.input.GapBufferKt:
+    Removed class androidx.compose.ui.text.input.GapBufferKt
+RemovedClass: androidx.compose.ui.text.input.GapBuffer_jvmKt:
+    Removed class androidx.compose.ui.text.input.GapBuffer_jvmKt
+RemovedClass: androidx.compose.ui.text.intl.AndroidPlatformLocale_androidKt:
+    Removed class androidx.compose.ui.text.intl.AndroidPlatformLocale_androidKt
+RemovedClass: androidx.compose.ui.text.intl.PlatformLocaleKt:
+    Removed class androidx.compose.ui.text.intl.PlatformLocaleKt
+RemovedClass: androidx.compose.ui.text.platform.AndroidMultiParagraphDrawKt:
+    Removed class androidx.compose.ui.text.platform.AndroidMultiParagraphDrawKt
+RemovedClass: androidx.compose.ui.text.platform.AndroidParagraphHelper_androidKt:
+    Removed class androidx.compose.ui.text.platform.AndroidParagraphHelper_androidKt
+RemovedClass: androidx.compose.ui.text.platform.AndroidParagraphIntrinsics_androidKt:
+    Removed class androidx.compose.ui.text.platform.AndroidParagraphIntrinsics_androidKt
+RemovedClass: androidx.compose.ui.text.platform.AndroidParagraph_androidKt:
+    Removed class androidx.compose.ui.text.platform.AndroidParagraph_androidKt
+RemovedClass: androidx.compose.ui.text.platform.AndroidStringDelegate_androidKt:
+    Removed class androidx.compose.ui.text.platform.AndroidStringDelegate_androidKt
+RemovedClass: androidx.compose.ui.text.platform.AndroidTextPaint_androidKt:
+    Removed class androidx.compose.ui.text.platform.AndroidTextPaint_androidKt
+RemovedClass: androidx.compose.ui.text.platform.Synchronization_jvmKt:
+    Removed class androidx.compose.ui.text.platform.Synchronization_jvmKt
+RemovedClass: androidx.compose.ui.text.platform.extensions.LocaleExtensions_androidKt:
+    Removed class androidx.compose.ui.text.platform.extensions.LocaleExtensions_androidKt
+RemovedClass: androidx.compose.ui.text.platform.extensions.PlaceholderExtensions_androidKt:
+    Removed class androidx.compose.ui.text.platform.extensions.PlaceholderExtensions_androidKt
+RemovedClass: androidx.compose.ui.text.platform.extensions.SpannableExtensions_androidKt:
+    Removed class androidx.compose.ui.text.platform.extensions.SpannableExtensions_androidKt
+RemovedClass: androidx.compose.ui.text.platform.extensions.TextPaintExtensions_androidKt:
+    Removed class androidx.compose.ui.text.platform.extensions.TextPaintExtensions_androidKt
+RemovedClass: androidx.compose.ui.text.style.TextDrawStyleKt:
+    Removed class androidx.compose.ui.text.style.TextDrawStyleKt
+
+
+RemovedPackage: androidx.compose.ui.text.android.style:
+    Removed package androidx.compose.ui.text.android.style
+RemovedPackage: androidx.compose.ui.text.caches:
+    Removed package androidx.compose.ui.text.caches
+RemovedPackage: androidx.compose.ui.text.internal:
+    Removed package androidx.compose.ui.text.internal
diff --git a/compose/ui/ui-text/api/current.txt b/compose/ui/ui-text/api/current.txt
index 8fc4fc2..1c59a83 100644
--- a/compose/ui/ui-text/api/current.txt
+++ b/compose/ui/ui-text/api/current.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.ui.text {
 
-  public final class ActualAtomicReferenceJvmKt {
-  }
-
-  public final class AndroidParagraph_androidKt {
-  }
-
   public final class AndroidTextStyle_androidKt {
     method public static androidx.compose.ui.text.PlatformParagraphStyle lerp(androidx.compose.ui.text.PlatformParagraphStyle start, androidx.compose.ui.text.PlatformParagraphStyle stop, float fraction);
     method public static androidx.compose.ui.text.PlatformSpanStyle lerp(androidx.compose.ui.text.PlatformSpanStyle start, androidx.compose.ui.text.PlatformSpanStyle stop, float fraction);
@@ -98,12 +92,6 @@
     property public final int None;
   }
 
-  public final class JvmAnnotatedString_jvmKt {
-  }
-
-  public final class JvmCharHelpers_androidKt {
-  }
-
   public final class MultiParagraph {
     ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, long constraints, optional int maxLines, optional boolean ellipsis);
     ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, optional int maxLines, optional boolean ellipsis, float width);
@@ -168,12 +156,6 @@
     property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
   }
 
-  public final class MultiParagraphIntrinsicsKt {
-  }
-
-  public final class MultiParagraphKt {
-  }
-
   public sealed interface Paragraph {
     method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
     method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
@@ -338,9 +320,6 @@
     property public final androidx.compose.ui.text.PlatformSpanStyle? spanStyle;
   }
 
-  public final class SaversKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SpanStyle {
     ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
     ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
@@ -395,9 +374,6 @@
     method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
   }
 
-  public final class TempListUtilsKt {
-  }
-
   public final class TextLayoutInput {
     ctor @Deprecated public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, long constraints);
     ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, long constraints);
@@ -468,9 +444,6 @@
     property public final long size;
   }
 
-  public final class TextMeasurerKt {
-  }
-
   public final class TextPainter {
     method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
     field public static final androidx.compose.ui.text.TextPainter INSTANCE;
@@ -600,50 +573,6 @@
   public final class LayoutCompatKt {
   }
 
-  public final class LayoutHelperKt {
-  }
-
-  public final class LayoutIntrinsicsKt {
-  }
-
-  public final class PaintExtensionsKt {
-  }
-
-  public final class SpannedExtensionsKt {
-  }
-
-  public final class StaticLayoutFactoryKt {
-  }
-
-  public final class TempListUtilsKt {
-  }
-
-  public final class TextLayoutKt {
-  }
-
-}
-
-package androidx.compose.ui.text.android.style {
-
-  public final class IndentationFixSpanKt {
-  }
-
-  public final class LineHeightStyleSpanKt {
-  }
-
-  public final class PlaceholderSpanKt {
-  }
-
-}
-
-package androidx.compose.ui.text.caches {
-
-  public final class ContainerHelpersKt {
-  }
-
-  public final class SimpleArrayMapKt {
-  }
-
 }
 
 package androidx.compose.ui.text.font {
@@ -670,15 +599,6 @@
     method @RequiresApi(26) @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font Font(android.os.ParcelFileDescriptor fileDescriptor, optional androidx.compose.ui.text.font.FontWeight weight, optional int style, optional androidx.compose.ui.text.font.FontVariation.Settings variationSettings);
   }
 
-  public final class AndroidFontLoader_androidKt {
-  }
-
-  public final class AndroidFontResolveInterceptor_androidKt {
-  }
-
-  public final class AndroidFontUtils_androidKt {
-  }
-
   public final class AndroidTypeface_androidKt {
     method public static androidx.compose.ui.text.font.FontFamily FontFamily(android.graphics.Typeface typeface);
     method @Deprecated public static androidx.compose.ui.text.font.Typeface Typeface(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, optional java.util.List<kotlin.Pair<androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontStyle>>? styles);
@@ -751,9 +671,6 @@
     method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Typeface typeface);
   }
 
-  public final class FontFamilyResolverKt {
-  }
-
   public final class FontFamilyResolver_androidKt {
     method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context);
     method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context, kotlin.coroutines.CoroutineContext coroutineContext);
@@ -771,9 +688,6 @@
     property public final java.util.List<androidx.compose.ui.text.font.Font> fonts;
   }
 
-  public final class FontListFontFamilyTypefaceAdapterKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class FontLoadingStrategy {
     method public int getValue();
     property public final int value;
@@ -819,9 +733,6 @@
     property public final int Weight;
   }
 
-  public final class FontSynthesis_androidKt {
-  }
-
   public final class FontVariation {
     method public androidx.compose.ui.text.font.FontVariation.Setting Setting(String name, float value);
     method public androidx.compose.ui.text.font.FontVariation.Settings Settings(androidx.compose.ui.text.font.FontWeight weight, int style, androidx.compose.ui.text.font.FontVariation.Setting... settings);
@@ -909,9 +820,6 @@
     property public final androidx.compose.ui.text.font.Typeface typeface;
   }
 
-  public final class PlatformTypefacesKt {
-  }
-
   public final class ResourceFont implements androidx.compose.ui.text.font.Font {
     method public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
     method public int getResId();
@@ -978,9 +886,6 @@
     method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
   }
 
-  public final class EditCommandKt {
-  }
-
   public final class EditProcessor {
     ctor public EditProcessor();
     method public androidx.compose.ui.text.input.TextFieldValue apply(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
@@ -992,20 +897,11 @@
     ctor public EditingBuffer(androidx.compose.ui.text.AnnotatedString text, long selection);
   }
 
-  public final class EditingBufferKt {
-  }
-
   public final class FinishComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
     ctor public FinishComposingTextCommand();
     method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
   }
 
-  public final class GapBufferKt {
-  }
-
-  public final class GapBuffer_jvmKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class ImeAction {
     field public static final androidx.compose.ui.text.input.ImeAction.Companion Companion;
   }
@@ -1225,18 +1121,8 @@
 
 }
 
-package androidx.compose.ui.text.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.text.intl {
 
-  public final class AndroidPlatformLocale_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class Locale {
     ctor public Locale(String languageTag);
     method public String getLanguage();
@@ -1275,9 +1161,6 @@
     property public final androidx.compose.ui.text.intl.LocaleList current;
   }
 
-  public final class PlatformLocaleKt {
-  }
-
 }
 
 package androidx.compose.ui.text.platform {
@@ -1285,46 +1168,10 @@
   public final class AndroidAccessibilitySpannableString_androidKt {
   }
 
-  public final class AndroidMultiParagraphDrawKt {
-  }
-
-  public final class AndroidParagraphHelper_androidKt {
-  }
-
-  public final class AndroidParagraphIntrinsics_androidKt {
-  }
-
-  public final class AndroidParagraph_androidKt {
-  }
-
-  public final class AndroidStringDelegate_androidKt {
-  }
-
-  public final class AndroidTextPaint_androidKt {
-  }
-
-  public final class EmojiCompatStatusKt {
-  }
-
-  public final class Synchronization_jvmKt {
-  }
-
 }
 
 package androidx.compose.ui.text.platform.extensions {
 
-  public final class LocaleExtensions_androidKt {
-  }
-
-  public final class PlaceholderExtensions_androidKt {
-  }
-
-  public final class SpannableExtensions_androidKt {
-  }
-
-  public final class TextPaintExtensions_androidKt {
-  }
-
   public final class TtsAnnotationExtensions_androidKt {
     method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.TtsAnnotation);
     method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.VerbatimTtsAnnotation);
@@ -1428,9 +1275,6 @@
     property public final int Phrase;
   }
 
-  public final class LineBreak_androidKt {
-  }
-
   public final class LineHeightStyle {
     ctor public LineHeightStyle(float alignment, int trim);
     method public float getAlignment();
@@ -1537,9 +1381,6 @@
     property public final int Rtl;
   }
 
-  public final class TextDrawStyleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class TextGeometricTransform {
     ctor public TextGeometricTransform(optional float scaleX, optional float skewX);
     method public androidx.compose.ui.text.style.TextGeometricTransform copy(optional float scaleX, optional float skewX);
diff --git a/compose/ui/ui-text/api/public_plus_experimental_1.4.0-beta01.txt b/compose/ui/ui-text/api/public_plus_experimental_1.4.0-beta01.txt
index 1b0de80..27b653a 100644
--- a/compose/ui/ui-text/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/ui/ui-text/api/public_plus_experimental_1.4.0-beta01.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.ui.text {
 
-  public final class ActualAtomicReferenceJvmKt {
-  }
-
-  public final class AndroidParagraph_androidKt {
-  }
-
   public final class AndroidTextStyle_androidKt {
     method public static androidx.compose.ui.text.PlatformParagraphStyle lerp(androidx.compose.ui.text.PlatformParagraphStyle start, androidx.compose.ui.text.PlatformParagraphStyle stop, float fraction);
     method public static androidx.compose.ui.text.PlatformSpanStyle lerp(androidx.compose.ui.text.PlatformSpanStyle start, androidx.compose.ui.text.PlatformSpanStyle stop, float fraction);
@@ -111,12 +105,6 @@
   @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY}) public @interface InternalTextApi {
   }
 
-  public final class JvmAnnotatedString_jvmKt {
-  }
-
-  public final class JvmCharHelpers_androidKt {
-  }
-
   public final class MultiParagraph {
     ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, long constraints, optional int maxLines, optional boolean ellipsis);
     ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, optional int maxLines, optional boolean ellipsis, float width);
@@ -183,12 +171,6 @@
     property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
   }
 
-  public final class MultiParagraphIntrinsicsKt {
-  }
-
-  public final class MultiParagraphKt {
-  }
-
   public sealed interface Paragraph {
     method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
     method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
@@ -359,9 +341,6 @@
     property public final androidx.compose.ui.text.PlatformSpanStyle? spanStyle;
   }
 
-  public final class SaversKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SpanStyle {
     ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
     ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
@@ -426,9 +405,6 @@
     method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
   }
 
-  public final class TempListUtilsKt {
-  }
-
   public final class TextLayoutInput {
     ctor @Deprecated public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, long constraints);
     ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, long constraints);
@@ -505,9 +481,6 @@
     method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextLayoutResult measure(String text, optional androidx.compose.ui.text.TextStyle style, optional int overflow, optional boolean softWrap, optional int maxLines, optional long constraints, optional androidx.compose.ui.unit.LayoutDirection layoutDirection, optional androidx.compose.ui.unit.Density density, optional androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional boolean skipCache);
   }
 
-  public final class TextMeasurerKt {
-  }
-
   public final class TextPainter {
     method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
     field public static final androidx.compose.ui.text.TextPainter INSTANCE;
@@ -662,50 +635,6 @@
   public final class LayoutCompatKt {
   }
 
-  public final class LayoutHelperKt {
-  }
-
-  public final class LayoutIntrinsicsKt {
-  }
-
-  public final class PaintExtensionsKt {
-  }
-
-  public final class SpannedExtensionsKt {
-  }
-
-  public final class StaticLayoutFactoryKt {
-  }
-
-  public final class TempListUtilsKt {
-  }
-
-  public final class TextLayoutKt {
-  }
-
-}
-
-package androidx.compose.ui.text.android.style {
-
-  public final class IndentationFixSpanKt {
-  }
-
-  public final class LineHeightStyleSpanKt {
-  }
-
-  public final class PlaceholderSpanKt {
-  }
-
-}
-
-package androidx.compose.ui.text.caches {
-
-  public final class ContainerHelpersKt {
-  }
-
-  public final class SimpleArrayMapKt {
-  }
-
 }
 
 package androidx.compose.ui.text.font {
@@ -732,15 +661,6 @@
     method @RequiresApi(26) @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font Font(android.os.ParcelFileDescriptor fileDescriptor, optional androidx.compose.ui.text.font.FontWeight weight, optional int style, optional androidx.compose.ui.text.font.FontVariation.Settings variationSettings);
   }
 
-  public final class AndroidFontLoader_androidKt {
-  }
-
-  public final class AndroidFontResolveInterceptor_androidKt {
-  }
-
-  public final class AndroidFontUtils_androidKt {
-  }
-
   public final class AndroidTypeface_androidKt {
     method public static androidx.compose.ui.text.font.FontFamily FontFamily(android.graphics.Typeface typeface);
     method @Deprecated public static androidx.compose.ui.text.font.Typeface Typeface(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, optional java.util.List<kotlin.Pair<androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontStyle>>? styles);
@@ -813,9 +733,6 @@
     method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Typeface typeface);
   }
 
-  public final class FontFamilyResolverKt {
-  }
-
   public final class FontFamilyResolver_androidKt {
     method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context);
     method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context, kotlin.coroutines.CoroutineContext coroutineContext);
@@ -834,9 +751,6 @@
     property public final java.util.List<androidx.compose.ui.text.font.Font> fonts;
   }
 
-  public final class FontListFontFamilyTypefaceAdapterKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class FontLoadingStrategy {
     method public int getValue();
     property public final int value;
@@ -882,9 +796,6 @@
     property public final int Weight;
   }
 
-  public final class FontSynthesis_androidKt {
-  }
-
   public final class FontVariation {
     method public androidx.compose.ui.text.font.FontVariation.Setting Setting(String name, float value);
     method public androidx.compose.ui.text.font.FontVariation.Settings Settings(androidx.compose.ui.text.font.FontWeight weight, int style, androidx.compose.ui.text.font.FontVariation.Setting... settings);
@@ -972,9 +883,6 @@
     property public final androidx.compose.ui.text.font.Typeface typeface;
   }
 
-  public final class PlatformTypefacesKt {
-  }
-
   public final class ResourceFont implements androidx.compose.ui.text.font.Font {
     method public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
     method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style, optional int loadingStrategy, optional androidx.compose.ui.text.font.FontVariation.Settings variationSettings);
@@ -1045,9 +953,6 @@
     method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
   }
 
-  public final class EditCommandKt {
-  }
-
   public final class EditProcessor {
     ctor public EditProcessor();
     method public androidx.compose.ui.text.input.TextFieldValue apply(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
@@ -1059,20 +964,11 @@
     ctor public EditingBuffer(androidx.compose.ui.text.AnnotatedString text, long selection);
   }
 
-  public final class EditingBufferKt {
-  }
-
   public final class FinishComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
     ctor public FinishComposingTextCommand();
     method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
   }
 
-  public final class GapBufferKt {
-  }
-
-  public final class GapBuffer_jvmKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class ImeAction {
     field public static final androidx.compose.ui.text.input.ImeAction.Companion Companion;
   }
@@ -1292,18 +1188,8 @@
 
 }
 
-package androidx.compose.ui.text.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.text.intl {
 
-  public final class AndroidPlatformLocale_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class Locale {
     ctor public Locale(String languageTag);
     method public String getLanguage();
@@ -1342,9 +1228,6 @@
     property public final androidx.compose.ui.text.intl.LocaleList current;
   }
 
-  public final class PlatformLocaleKt {
-  }
-
 }
 
 package androidx.compose.ui.text.platform {
@@ -1352,46 +1235,10 @@
   public final class AndroidAccessibilitySpannableString_androidKt {
   }
 
-  public final class AndroidMultiParagraphDrawKt {
-  }
-
-  public final class AndroidParagraphHelper_androidKt {
-  }
-
-  public final class AndroidParagraphIntrinsics_androidKt {
-  }
-
-  public final class AndroidParagraph_androidKt {
-  }
-
-  public final class AndroidStringDelegate_androidKt {
-  }
-
-  public final class AndroidTextPaint_androidKt {
-  }
-
-  public final class EmojiCompatStatusKt {
-  }
-
-  public final class Synchronization_jvmKt {
-  }
-
 }
 
 package androidx.compose.ui.text.platform.extensions {
 
-  public final class LocaleExtensions_androidKt {
-  }
-
-  public final class PlaceholderExtensions_androidKt {
-  }
-
-  public final class SpannableExtensions_androidKt {
-  }
-
-  public final class TextPaintExtensions_androidKt {
-  }
-
   public final class TtsAnnotationExtensions_androidKt {
     method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.TtsAnnotation);
     method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.VerbatimTtsAnnotation);
@@ -1496,9 +1343,6 @@
     property public final int Phrase;
   }
 
-  public final class LineBreak_androidKt {
-  }
-
   public final class LineHeightStyle {
     ctor public LineHeightStyle(float alignment, int trim);
     method public float getAlignment();
@@ -1606,9 +1450,6 @@
     property public final int Rtl;
   }
 
-  public final class TextDrawStyleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class TextGeometricTransform {
     ctor public TextGeometricTransform(optional float scaleX, optional float skewX);
     method public androidx.compose.ui.text.style.TextGeometricTransform copy(optional float scaleX, optional float skewX);
diff --git a/compose/ui/ui-text/api/public_plus_experimental_current.txt b/compose/ui/ui-text/api/public_plus_experimental_current.txt
index 1b0de80..27b653a 100644
--- a/compose/ui/ui-text/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-text/api/public_plus_experimental_current.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.ui.text {
 
-  public final class ActualAtomicReferenceJvmKt {
-  }
-
-  public final class AndroidParagraph_androidKt {
-  }
-
   public final class AndroidTextStyle_androidKt {
     method public static androidx.compose.ui.text.PlatformParagraphStyle lerp(androidx.compose.ui.text.PlatformParagraphStyle start, androidx.compose.ui.text.PlatformParagraphStyle stop, float fraction);
     method public static androidx.compose.ui.text.PlatformSpanStyle lerp(androidx.compose.ui.text.PlatformSpanStyle start, androidx.compose.ui.text.PlatformSpanStyle stop, float fraction);
@@ -111,12 +105,6 @@
   @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY}) public @interface InternalTextApi {
   }
 
-  public final class JvmAnnotatedString_jvmKt {
-  }
-
-  public final class JvmCharHelpers_androidKt {
-  }
-
   public final class MultiParagraph {
     ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, long constraints, optional int maxLines, optional boolean ellipsis);
     ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, optional int maxLines, optional boolean ellipsis, float width);
@@ -183,12 +171,6 @@
     property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
   }
 
-  public final class MultiParagraphIntrinsicsKt {
-  }
-
-  public final class MultiParagraphKt {
-  }
-
   public sealed interface Paragraph {
     method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
     method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
@@ -359,9 +341,6 @@
     property public final androidx.compose.ui.text.PlatformSpanStyle? spanStyle;
   }
 
-  public final class SaversKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SpanStyle {
     ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
     ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
@@ -426,9 +405,6 @@
     method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
   }
 
-  public final class TempListUtilsKt {
-  }
-
   public final class TextLayoutInput {
     ctor @Deprecated public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, long constraints);
     ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, long constraints);
@@ -505,9 +481,6 @@
     method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextLayoutResult measure(String text, optional androidx.compose.ui.text.TextStyle style, optional int overflow, optional boolean softWrap, optional int maxLines, optional long constraints, optional androidx.compose.ui.unit.LayoutDirection layoutDirection, optional androidx.compose.ui.unit.Density density, optional androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional boolean skipCache);
   }
 
-  public final class TextMeasurerKt {
-  }
-
   public final class TextPainter {
     method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
     field public static final androidx.compose.ui.text.TextPainter INSTANCE;
@@ -662,50 +635,6 @@
   public final class LayoutCompatKt {
   }
 
-  public final class LayoutHelperKt {
-  }
-
-  public final class LayoutIntrinsicsKt {
-  }
-
-  public final class PaintExtensionsKt {
-  }
-
-  public final class SpannedExtensionsKt {
-  }
-
-  public final class StaticLayoutFactoryKt {
-  }
-
-  public final class TempListUtilsKt {
-  }
-
-  public final class TextLayoutKt {
-  }
-
-}
-
-package androidx.compose.ui.text.android.style {
-
-  public final class IndentationFixSpanKt {
-  }
-
-  public final class LineHeightStyleSpanKt {
-  }
-
-  public final class PlaceholderSpanKt {
-  }
-
-}
-
-package androidx.compose.ui.text.caches {
-
-  public final class ContainerHelpersKt {
-  }
-
-  public final class SimpleArrayMapKt {
-  }
-
 }
 
 package androidx.compose.ui.text.font {
@@ -732,15 +661,6 @@
     method @RequiresApi(26) @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font Font(android.os.ParcelFileDescriptor fileDescriptor, optional androidx.compose.ui.text.font.FontWeight weight, optional int style, optional androidx.compose.ui.text.font.FontVariation.Settings variationSettings);
   }
 
-  public final class AndroidFontLoader_androidKt {
-  }
-
-  public final class AndroidFontResolveInterceptor_androidKt {
-  }
-
-  public final class AndroidFontUtils_androidKt {
-  }
-
   public final class AndroidTypeface_androidKt {
     method public static androidx.compose.ui.text.font.FontFamily FontFamily(android.graphics.Typeface typeface);
     method @Deprecated public static androidx.compose.ui.text.font.Typeface Typeface(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, optional java.util.List<kotlin.Pair<androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontStyle>>? styles);
@@ -813,9 +733,6 @@
     method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Typeface typeface);
   }
 
-  public final class FontFamilyResolverKt {
-  }
-
   public final class FontFamilyResolver_androidKt {
     method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context);
     method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context, kotlin.coroutines.CoroutineContext coroutineContext);
@@ -834,9 +751,6 @@
     property public final java.util.List<androidx.compose.ui.text.font.Font> fonts;
   }
 
-  public final class FontListFontFamilyTypefaceAdapterKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class FontLoadingStrategy {
     method public int getValue();
     property public final int value;
@@ -882,9 +796,6 @@
     property public final int Weight;
   }
 
-  public final class FontSynthesis_androidKt {
-  }
-
   public final class FontVariation {
     method public androidx.compose.ui.text.font.FontVariation.Setting Setting(String name, float value);
     method public androidx.compose.ui.text.font.FontVariation.Settings Settings(androidx.compose.ui.text.font.FontWeight weight, int style, androidx.compose.ui.text.font.FontVariation.Setting... settings);
@@ -972,9 +883,6 @@
     property public final androidx.compose.ui.text.font.Typeface typeface;
   }
 
-  public final class PlatformTypefacesKt {
-  }
-
   public final class ResourceFont implements androidx.compose.ui.text.font.Font {
     method public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
     method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style, optional int loadingStrategy, optional androidx.compose.ui.text.font.FontVariation.Settings variationSettings);
@@ -1045,9 +953,6 @@
     method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
   }
 
-  public final class EditCommandKt {
-  }
-
   public final class EditProcessor {
     ctor public EditProcessor();
     method public androidx.compose.ui.text.input.TextFieldValue apply(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
@@ -1059,20 +964,11 @@
     ctor public EditingBuffer(androidx.compose.ui.text.AnnotatedString text, long selection);
   }
 
-  public final class EditingBufferKt {
-  }
-
   public final class FinishComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
     ctor public FinishComposingTextCommand();
     method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
   }
 
-  public final class GapBufferKt {
-  }
-
-  public final class GapBuffer_jvmKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class ImeAction {
     field public static final androidx.compose.ui.text.input.ImeAction.Companion Companion;
   }
@@ -1292,18 +1188,8 @@
 
 }
 
-package androidx.compose.ui.text.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.text.intl {
 
-  public final class AndroidPlatformLocale_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class Locale {
     ctor public Locale(String languageTag);
     method public String getLanguage();
@@ -1342,9 +1228,6 @@
     property public final androidx.compose.ui.text.intl.LocaleList current;
   }
 
-  public final class PlatformLocaleKt {
-  }
-
 }
 
 package androidx.compose.ui.text.platform {
@@ -1352,46 +1235,10 @@
   public final class AndroidAccessibilitySpannableString_androidKt {
   }
 
-  public final class AndroidMultiParagraphDrawKt {
-  }
-
-  public final class AndroidParagraphHelper_androidKt {
-  }
-
-  public final class AndroidParagraphIntrinsics_androidKt {
-  }
-
-  public final class AndroidParagraph_androidKt {
-  }
-
-  public final class AndroidStringDelegate_androidKt {
-  }
-
-  public final class AndroidTextPaint_androidKt {
-  }
-
-  public final class EmojiCompatStatusKt {
-  }
-
-  public final class Synchronization_jvmKt {
-  }
-
 }
 
 package androidx.compose.ui.text.platform.extensions {
 
-  public final class LocaleExtensions_androidKt {
-  }
-
-  public final class PlaceholderExtensions_androidKt {
-  }
-
-  public final class SpannableExtensions_androidKt {
-  }
-
-  public final class TextPaintExtensions_androidKt {
-  }
-
   public final class TtsAnnotationExtensions_androidKt {
     method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.TtsAnnotation);
     method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.VerbatimTtsAnnotation);
@@ -1496,9 +1343,6 @@
     property public final int Phrase;
   }
 
-  public final class LineBreak_androidKt {
-  }
-
   public final class LineHeightStyle {
     ctor public LineHeightStyle(float alignment, int trim);
     method public float getAlignment();
@@ -1606,9 +1450,6 @@
     property public final int Rtl;
   }
 
-  public final class TextDrawStyleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class TextGeometricTransform {
     ctor public TextGeometricTransform(optional float scaleX, optional float skewX);
     method public androidx.compose.ui.text.style.TextGeometricTransform copy(optional float scaleX, optional float skewX);
diff --git a/compose/ui/ui-text/api/restricted_1.4.0-beta01.txt b/compose/ui/ui-text/api/restricted_1.4.0-beta01.txt
index 8fc4fc2..1c59a83 100644
--- a/compose/ui/ui-text/api/restricted_1.4.0-beta01.txt
+++ b/compose/ui/ui-text/api/restricted_1.4.0-beta01.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.ui.text {
 
-  public final class ActualAtomicReferenceJvmKt {
-  }
-
-  public final class AndroidParagraph_androidKt {
-  }
-
   public final class AndroidTextStyle_androidKt {
     method public static androidx.compose.ui.text.PlatformParagraphStyle lerp(androidx.compose.ui.text.PlatformParagraphStyle start, androidx.compose.ui.text.PlatformParagraphStyle stop, float fraction);
     method public static androidx.compose.ui.text.PlatformSpanStyle lerp(androidx.compose.ui.text.PlatformSpanStyle start, androidx.compose.ui.text.PlatformSpanStyle stop, float fraction);
@@ -98,12 +92,6 @@
     property public final int None;
   }
 
-  public final class JvmAnnotatedString_jvmKt {
-  }
-
-  public final class JvmCharHelpers_androidKt {
-  }
-
   public final class MultiParagraph {
     ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, long constraints, optional int maxLines, optional boolean ellipsis);
     ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, optional int maxLines, optional boolean ellipsis, float width);
@@ -168,12 +156,6 @@
     property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
   }
 
-  public final class MultiParagraphIntrinsicsKt {
-  }
-
-  public final class MultiParagraphKt {
-  }
-
   public sealed interface Paragraph {
     method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
     method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
@@ -338,9 +320,6 @@
     property public final androidx.compose.ui.text.PlatformSpanStyle? spanStyle;
   }
 
-  public final class SaversKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SpanStyle {
     ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
     ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
@@ -395,9 +374,6 @@
     method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
   }
 
-  public final class TempListUtilsKt {
-  }
-
   public final class TextLayoutInput {
     ctor @Deprecated public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, long constraints);
     ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, long constraints);
@@ -468,9 +444,6 @@
     property public final long size;
   }
 
-  public final class TextMeasurerKt {
-  }
-
   public final class TextPainter {
     method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
     field public static final androidx.compose.ui.text.TextPainter INSTANCE;
@@ -600,50 +573,6 @@
   public final class LayoutCompatKt {
   }
 
-  public final class LayoutHelperKt {
-  }
-
-  public final class LayoutIntrinsicsKt {
-  }
-
-  public final class PaintExtensionsKt {
-  }
-
-  public final class SpannedExtensionsKt {
-  }
-
-  public final class StaticLayoutFactoryKt {
-  }
-
-  public final class TempListUtilsKt {
-  }
-
-  public final class TextLayoutKt {
-  }
-
-}
-
-package androidx.compose.ui.text.android.style {
-
-  public final class IndentationFixSpanKt {
-  }
-
-  public final class LineHeightStyleSpanKt {
-  }
-
-  public final class PlaceholderSpanKt {
-  }
-
-}
-
-package androidx.compose.ui.text.caches {
-
-  public final class ContainerHelpersKt {
-  }
-
-  public final class SimpleArrayMapKt {
-  }
-
 }
 
 package androidx.compose.ui.text.font {
@@ -670,15 +599,6 @@
     method @RequiresApi(26) @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font Font(android.os.ParcelFileDescriptor fileDescriptor, optional androidx.compose.ui.text.font.FontWeight weight, optional int style, optional androidx.compose.ui.text.font.FontVariation.Settings variationSettings);
   }
 
-  public final class AndroidFontLoader_androidKt {
-  }
-
-  public final class AndroidFontResolveInterceptor_androidKt {
-  }
-
-  public final class AndroidFontUtils_androidKt {
-  }
-
   public final class AndroidTypeface_androidKt {
     method public static androidx.compose.ui.text.font.FontFamily FontFamily(android.graphics.Typeface typeface);
     method @Deprecated public static androidx.compose.ui.text.font.Typeface Typeface(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, optional java.util.List<kotlin.Pair<androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontStyle>>? styles);
@@ -751,9 +671,6 @@
     method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Typeface typeface);
   }
 
-  public final class FontFamilyResolverKt {
-  }
-
   public final class FontFamilyResolver_androidKt {
     method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context);
     method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context, kotlin.coroutines.CoroutineContext coroutineContext);
@@ -771,9 +688,6 @@
     property public final java.util.List<androidx.compose.ui.text.font.Font> fonts;
   }
 
-  public final class FontListFontFamilyTypefaceAdapterKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class FontLoadingStrategy {
     method public int getValue();
     property public final int value;
@@ -819,9 +733,6 @@
     property public final int Weight;
   }
 
-  public final class FontSynthesis_androidKt {
-  }
-
   public final class FontVariation {
     method public androidx.compose.ui.text.font.FontVariation.Setting Setting(String name, float value);
     method public androidx.compose.ui.text.font.FontVariation.Settings Settings(androidx.compose.ui.text.font.FontWeight weight, int style, androidx.compose.ui.text.font.FontVariation.Setting... settings);
@@ -909,9 +820,6 @@
     property public final androidx.compose.ui.text.font.Typeface typeface;
   }
 
-  public final class PlatformTypefacesKt {
-  }
-
   public final class ResourceFont implements androidx.compose.ui.text.font.Font {
     method public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
     method public int getResId();
@@ -978,9 +886,6 @@
     method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
   }
 
-  public final class EditCommandKt {
-  }
-
   public final class EditProcessor {
     ctor public EditProcessor();
     method public androidx.compose.ui.text.input.TextFieldValue apply(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
@@ -992,20 +897,11 @@
     ctor public EditingBuffer(androidx.compose.ui.text.AnnotatedString text, long selection);
   }
 
-  public final class EditingBufferKt {
-  }
-
   public final class FinishComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
     ctor public FinishComposingTextCommand();
     method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
   }
 
-  public final class GapBufferKt {
-  }
-
-  public final class GapBuffer_jvmKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class ImeAction {
     field public static final androidx.compose.ui.text.input.ImeAction.Companion Companion;
   }
@@ -1225,18 +1121,8 @@
 
 }
 
-package androidx.compose.ui.text.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.text.intl {
 
-  public final class AndroidPlatformLocale_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class Locale {
     ctor public Locale(String languageTag);
     method public String getLanguage();
@@ -1275,9 +1161,6 @@
     property public final androidx.compose.ui.text.intl.LocaleList current;
   }
 
-  public final class PlatformLocaleKt {
-  }
-
 }
 
 package androidx.compose.ui.text.platform {
@@ -1285,46 +1168,10 @@
   public final class AndroidAccessibilitySpannableString_androidKt {
   }
 
-  public final class AndroidMultiParagraphDrawKt {
-  }
-
-  public final class AndroidParagraphHelper_androidKt {
-  }
-
-  public final class AndroidParagraphIntrinsics_androidKt {
-  }
-
-  public final class AndroidParagraph_androidKt {
-  }
-
-  public final class AndroidStringDelegate_androidKt {
-  }
-
-  public final class AndroidTextPaint_androidKt {
-  }
-
-  public final class EmojiCompatStatusKt {
-  }
-
-  public final class Synchronization_jvmKt {
-  }
-
 }
 
 package androidx.compose.ui.text.platform.extensions {
 
-  public final class LocaleExtensions_androidKt {
-  }
-
-  public final class PlaceholderExtensions_androidKt {
-  }
-
-  public final class SpannableExtensions_androidKt {
-  }
-
-  public final class TextPaintExtensions_androidKt {
-  }
-
   public final class TtsAnnotationExtensions_androidKt {
     method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.TtsAnnotation);
     method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.VerbatimTtsAnnotation);
@@ -1428,9 +1275,6 @@
     property public final int Phrase;
   }
 
-  public final class LineBreak_androidKt {
-  }
-
   public final class LineHeightStyle {
     ctor public LineHeightStyle(float alignment, int trim);
     method public float getAlignment();
@@ -1537,9 +1381,6 @@
     property public final int Rtl;
   }
 
-  public final class TextDrawStyleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class TextGeometricTransform {
     ctor public TextGeometricTransform(optional float scaleX, optional float skewX);
     method public androidx.compose.ui.text.style.TextGeometricTransform copy(optional float scaleX, optional float skewX);
diff --git a/compose/ui/ui-text/api/restricted_current.ignore b/compose/ui/ui-text/api/restricted_current.ignore
index 24501fb..1ecda6d 100644
--- a/compose/ui/ui-text/api/restricted_current.ignore
+++ b/compose/ui/ui-text/api/restricted_current.ignore
@@ -1,3 +1,95 @@
 // Baseline format: 1.0
 ChangedType: androidx.compose.ui.text.AnnotatedString.Builder#append(char):
     Method androidx.compose.ui.text.AnnotatedString.Builder.append has changed return type from void to androidx.compose.ui.text.AnnotatedString.Builder
+
+
+RemovedClass: androidx.compose.ui.text.ActualAtomicReferenceJvmKt:
+    Removed class androidx.compose.ui.text.ActualAtomicReferenceJvmKt
+RemovedClass: androidx.compose.ui.text.AndroidParagraph_androidKt:
+    Removed class androidx.compose.ui.text.AndroidParagraph_androidKt
+RemovedClass: androidx.compose.ui.text.JvmAnnotatedString_jvmKt:
+    Removed class androidx.compose.ui.text.JvmAnnotatedString_jvmKt
+RemovedClass: androidx.compose.ui.text.JvmCharHelpers_androidKt:
+    Removed class androidx.compose.ui.text.JvmCharHelpers_androidKt
+RemovedClass: androidx.compose.ui.text.MultiParagraphIntrinsicsKt:
+    Removed class androidx.compose.ui.text.MultiParagraphIntrinsicsKt
+RemovedClass: androidx.compose.ui.text.MultiParagraphKt:
+    Removed class androidx.compose.ui.text.MultiParagraphKt
+RemovedClass: androidx.compose.ui.text.SaversKt:
+    Removed class androidx.compose.ui.text.SaversKt
+RemovedClass: androidx.compose.ui.text.TempListUtilsKt:
+    Removed class androidx.compose.ui.text.TempListUtilsKt
+RemovedClass: androidx.compose.ui.text.TextMeasurerKt:
+    Removed class androidx.compose.ui.text.TextMeasurerKt
+RemovedClass: androidx.compose.ui.text.android.LayoutHelperKt:
+    Removed class androidx.compose.ui.text.android.LayoutHelperKt
+RemovedClass: androidx.compose.ui.text.android.LayoutIntrinsicsKt:
+    Removed class androidx.compose.ui.text.android.LayoutIntrinsicsKt
+RemovedClass: androidx.compose.ui.text.android.PaintExtensionsKt:
+    Removed class androidx.compose.ui.text.android.PaintExtensionsKt
+RemovedClass: androidx.compose.ui.text.android.SpannedExtensionsKt:
+    Removed class androidx.compose.ui.text.android.SpannedExtensionsKt
+RemovedClass: androidx.compose.ui.text.android.StaticLayoutFactoryKt:
+    Removed class androidx.compose.ui.text.android.StaticLayoutFactoryKt
+RemovedClass: androidx.compose.ui.text.android.TempListUtilsKt:
+    Removed class androidx.compose.ui.text.android.TempListUtilsKt
+RemovedClass: androidx.compose.ui.text.android.TextLayoutKt:
+    Removed class androidx.compose.ui.text.android.TextLayoutKt
+RemovedClass: androidx.compose.ui.text.font.AndroidFontLoader_androidKt:
+    Removed class androidx.compose.ui.text.font.AndroidFontLoader_androidKt
+RemovedClass: androidx.compose.ui.text.font.AndroidFontResolveInterceptor_androidKt:
+    Removed class androidx.compose.ui.text.font.AndroidFontResolveInterceptor_androidKt
+RemovedClass: androidx.compose.ui.text.font.AndroidFontUtils_androidKt:
+    Removed class androidx.compose.ui.text.font.AndroidFontUtils_androidKt
+RemovedClass: androidx.compose.ui.text.font.FontFamilyResolverKt:
+    Removed class androidx.compose.ui.text.font.FontFamilyResolverKt
+RemovedClass: androidx.compose.ui.text.font.FontListFontFamilyTypefaceAdapterKt:
+    Removed class androidx.compose.ui.text.font.FontListFontFamilyTypefaceAdapterKt
+RemovedClass: androidx.compose.ui.text.font.FontSynthesis_androidKt:
+    Removed class androidx.compose.ui.text.font.FontSynthesis_androidKt
+RemovedClass: androidx.compose.ui.text.font.PlatformTypefacesKt:
+    Removed class androidx.compose.ui.text.font.PlatformTypefacesKt
+RemovedClass: androidx.compose.ui.text.input.EditCommandKt:
+    Removed class androidx.compose.ui.text.input.EditCommandKt
+RemovedClass: androidx.compose.ui.text.input.EditingBufferKt:
+    Removed class androidx.compose.ui.text.input.EditingBufferKt
+RemovedClass: androidx.compose.ui.text.input.GapBufferKt:
+    Removed class androidx.compose.ui.text.input.GapBufferKt
+RemovedClass: androidx.compose.ui.text.input.GapBuffer_jvmKt:
+    Removed class androidx.compose.ui.text.input.GapBuffer_jvmKt
+RemovedClass: androidx.compose.ui.text.intl.AndroidPlatformLocale_androidKt:
+    Removed class androidx.compose.ui.text.intl.AndroidPlatformLocale_androidKt
+RemovedClass: androidx.compose.ui.text.intl.PlatformLocaleKt:
+    Removed class androidx.compose.ui.text.intl.PlatformLocaleKt
+RemovedClass: androidx.compose.ui.text.platform.AndroidMultiParagraphDrawKt:
+    Removed class androidx.compose.ui.text.platform.AndroidMultiParagraphDrawKt
+RemovedClass: androidx.compose.ui.text.platform.AndroidParagraphHelper_androidKt:
+    Removed class androidx.compose.ui.text.platform.AndroidParagraphHelper_androidKt
+RemovedClass: androidx.compose.ui.text.platform.AndroidParagraphIntrinsics_androidKt:
+    Removed class androidx.compose.ui.text.platform.AndroidParagraphIntrinsics_androidKt
+RemovedClass: androidx.compose.ui.text.platform.AndroidParagraph_androidKt:
+    Removed class androidx.compose.ui.text.platform.AndroidParagraph_androidKt
+RemovedClass: androidx.compose.ui.text.platform.AndroidStringDelegate_androidKt:
+    Removed class androidx.compose.ui.text.platform.AndroidStringDelegate_androidKt
+RemovedClass: androidx.compose.ui.text.platform.AndroidTextPaint_androidKt:
+    Removed class androidx.compose.ui.text.platform.AndroidTextPaint_androidKt
+RemovedClass: androidx.compose.ui.text.platform.Synchronization_jvmKt:
+    Removed class androidx.compose.ui.text.platform.Synchronization_jvmKt
+RemovedClass: androidx.compose.ui.text.platform.extensions.LocaleExtensions_androidKt:
+    Removed class androidx.compose.ui.text.platform.extensions.LocaleExtensions_androidKt
+RemovedClass: androidx.compose.ui.text.platform.extensions.PlaceholderExtensions_androidKt:
+    Removed class androidx.compose.ui.text.platform.extensions.PlaceholderExtensions_androidKt
+RemovedClass: androidx.compose.ui.text.platform.extensions.SpannableExtensions_androidKt:
+    Removed class androidx.compose.ui.text.platform.extensions.SpannableExtensions_androidKt
+RemovedClass: androidx.compose.ui.text.platform.extensions.TextPaintExtensions_androidKt:
+    Removed class androidx.compose.ui.text.platform.extensions.TextPaintExtensions_androidKt
+RemovedClass: androidx.compose.ui.text.style.TextDrawStyleKt:
+    Removed class androidx.compose.ui.text.style.TextDrawStyleKt
+
+
+RemovedPackage: androidx.compose.ui.text.android.style:
+    Removed package androidx.compose.ui.text.android.style
+RemovedPackage: androidx.compose.ui.text.caches:
+    Removed package androidx.compose.ui.text.caches
+RemovedPackage: androidx.compose.ui.text.internal:
+    Removed package androidx.compose.ui.text.internal
diff --git a/compose/ui/ui-text/api/restricted_current.txt b/compose/ui/ui-text/api/restricted_current.txt
index 8fc4fc2..1c59a83 100644
--- a/compose/ui/ui-text/api/restricted_current.txt
+++ b/compose/ui/ui-text/api/restricted_current.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.compose.ui.text {
 
-  public final class ActualAtomicReferenceJvmKt {
-  }
-
-  public final class AndroidParagraph_androidKt {
-  }
-
   public final class AndroidTextStyle_androidKt {
     method public static androidx.compose.ui.text.PlatformParagraphStyle lerp(androidx.compose.ui.text.PlatformParagraphStyle start, androidx.compose.ui.text.PlatformParagraphStyle stop, float fraction);
     method public static androidx.compose.ui.text.PlatformSpanStyle lerp(androidx.compose.ui.text.PlatformSpanStyle start, androidx.compose.ui.text.PlatformSpanStyle stop, float fraction);
@@ -98,12 +92,6 @@
     property public final int None;
   }
 
-  public final class JvmAnnotatedString_jvmKt {
-  }
-
-  public final class JvmCharHelpers_androidKt {
-  }
-
   public final class MultiParagraph {
     ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, long constraints, optional int maxLines, optional boolean ellipsis);
     ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, optional int maxLines, optional boolean ellipsis, float width);
@@ -168,12 +156,6 @@
     property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
   }
 
-  public final class MultiParagraphIntrinsicsKt {
-  }
-
-  public final class MultiParagraphKt {
-  }
-
   public sealed interface Paragraph {
     method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
     method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
@@ -338,9 +320,6 @@
     property public final androidx.compose.ui.text.PlatformSpanStyle? spanStyle;
   }
 
-  public final class SaversKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class SpanStyle {
     ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
     ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
@@ -395,9 +374,6 @@
     method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
   }
 
-  public final class TempListUtilsKt {
-  }
-
   public final class TextLayoutInput {
     ctor @Deprecated public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, long constraints);
     ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, long constraints);
@@ -468,9 +444,6 @@
     property public final long size;
   }
 
-  public final class TextMeasurerKt {
-  }
-
   public final class TextPainter {
     method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
     field public static final androidx.compose.ui.text.TextPainter INSTANCE;
@@ -600,50 +573,6 @@
   public final class LayoutCompatKt {
   }
 
-  public final class LayoutHelperKt {
-  }
-
-  public final class LayoutIntrinsicsKt {
-  }
-
-  public final class PaintExtensionsKt {
-  }
-
-  public final class SpannedExtensionsKt {
-  }
-
-  public final class StaticLayoutFactoryKt {
-  }
-
-  public final class TempListUtilsKt {
-  }
-
-  public final class TextLayoutKt {
-  }
-
-}
-
-package androidx.compose.ui.text.android.style {
-
-  public final class IndentationFixSpanKt {
-  }
-
-  public final class LineHeightStyleSpanKt {
-  }
-
-  public final class PlaceholderSpanKt {
-  }
-
-}
-
-package androidx.compose.ui.text.caches {
-
-  public final class ContainerHelpersKt {
-  }
-
-  public final class SimpleArrayMapKt {
-  }
-
 }
 
 package androidx.compose.ui.text.font {
@@ -670,15 +599,6 @@
     method @RequiresApi(26) @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font Font(android.os.ParcelFileDescriptor fileDescriptor, optional androidx.compose.ui.text.font.FontWeight weight, optional int style, optional androidx.compose.ui.text.font.FontVariation.Settings variationSettings);
   }
 
-  public final class AndroidFontLoader_androidKt {
-  }
-
-  public final class AndroidFontResolveInterceptor_androidKt {
-  }
-
-  public final class AndroidFontUtils_androidKt {
-  }
-
   public final class AndroidTypeface_androidKt {
     method public static androidx.compose.ui.text.font.FontFamily FontFamily(android.graphics.Typeface typeface);
     method @Deprecated public static androidx.compose.ui.text.font.Typeface Typeface(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, optional java.util.List<kotlin.Pair<androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontStyle>>? styles);
@@ -751,9 +671,6 @@
     method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Typeface typeface);
   }
 
-  public final class FontFamilyResolverKt {
-  }
-
   public final class FontFamilyResolver_androidKt {
     method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context);
     method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context, kotlin.coroutines.CoroutineContext coroutineContext);
@@ -771,9 +688,6 @@
     property public final java.util.List<androidx.compose.ui.text.font.Font> fonts;
   }
 
-  public final class FontListFontFamilyTypefaceAdapterKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class FontLoadingStrategy {
     method public int getValue();
     property public final int value;
@@ -819,9 +733,6 @@
     property public final int Weight;
   }
 
-  public final class FontSynthesis_androidKt {
-  }
-
   public final class FontVariation {
     method public androidx.compose.ui.text.font.FontVariation.Setting Setting(String name, float value);
     method public androidx.compose.ui.text.font.FontVariation.Settings Settings(androidx.compose.ui.text.font.FontWeight weight, int style, androidx.compose.ui.text.font.FontVariation.Setting... settings);
@@ -909,9 +820,6 @@
     property public final androidx.compose.ui.text.font.Typeface typeface;
   }
 
-  public final class PlatformTypefacesKt {
-  }
-
   public final class ResourceFont implements androidx.compose.ui.text.font.Font {
     method public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
     method public int getResId();
@@ -978,9 +886,6 @@
     method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
   }
 
-  public final class EditCommandKt {
-  }
-
   public final class EditProcessor {
     ctor public EditProcessor();
     method public androidx.compose.ui.text.input.TextFieldValue apply(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
@@ -992,20 +897,11 @@
     ctor public EditingBuffer(androidx.compose.ui.text.AnnotatedString text, long selection);
   }
 
-  public final class EditingBufferKt {
-  }
-
   public final class FinishComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
     ctor public FinishComposingTextCommand();
     method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
   }
 
-  public final class GapBufferKt {
-  }
-
-  public final class GapBuffer_jvmKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class ImeAction {
     field public static final androidx.compose.ui.text.input.ImeAction.Companion Companion;
   }
@@ -1225,18 +1121,8 @@
 
 }
 
-package androidx.compose.ui.text.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.text.intl {
 
-  public final class AndroidPlatformLocale_androidKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class Locale {
     ctor public Locale(String languageTag);
     method public String getLanguage();
@@ -1275,9 +1161,6 @@
     property public final androidx.compose.ui.text.intl.LocaleList current;
   }
 
-  public final class PlatformLocaleKt {
-  }
-
 }
 
 package androidx.compose.ui.text.platform {
@@ -1285,46 +1168,10 @@
   public final class AndroidAccessibilitySpannableString_androidKt {
   }
 
-  public final class AndroidMultiParagraphDrawKt {
-  }
-
-  public final class AndroidParagraphHelper_androidKt {
-  }
-
-  public final class AndroidParagraphIntrinsics_androidKt {
-  }
-
-  public final class AndroidParagraph_androidKt {
-  }
-
-  public final class AndroidStringDelegate_androidKt {
-  }
-
-  public final class AndroidTextPaint_androidKt {
-  }
-
-  public final class EmojiCompatStatusKt {
-  }
-
-  public final class Synchronization_jvmKt {
-  }
-
 }
 
 package androidx.compose.ui.text.platform.extensions {
 
-  public final class LocaleExtensions_androidKt {
-  }
-
-  public final class PlaceholderExtensions_androidKt {
-  }
-
-  public final class SpannableExtensions_androidKt {
-  }
-
-  public final class TextPaintExtensions_androidKt {
-  }
-
   public final class TtsAnnotationExtensions_androidKt {
     method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.TtsAnnotation);
     method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.VerbatimTtsAnnotation);
@@ -1428,9 +1275,6 @@
     property public final int Phrase;
   }
 
-  public final class LineBreak_androidKt {
-  }
-
   public final class LineHeightStyle {
     ctor public LineHeightStyle(float alignment, int trim);
     method public float getAlignment();
@@ -1537,9 +1381,6 @@
     property public final int Rtl;
   }
 
-  public final class TextDrawStyleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class TextGeometricTransform {
     ctor public TextGeometricTransform(optional float scaleX, optional float skewX);
     method public androidx.compose.ui.text.style.TextGeometricTransform copy(optional float scaleX, optional float skewX);
diff --git a/compose/ui/ui-tooling-preview/api/1.4.0-beta01.txt b/compose/ui/ui-tooling-preview/api/1.4.0-beta01.txt
index 01e7297..a5363d9 100644
--- a/compose/ui/ui-tooling-preview/api/1.4.0-beta01.txt
+++ b/compose/ui/ui-tooling-preview/api/1.4.0-beta01.txt
@@ -109,8 +109,5 @@
     property public kotlin.sequences.Sequence<java.lang.String> values;
   }
 
-  public final class LoremIpsumKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-tooling-preview/api/current.ignore b/compose/ui/ui-tooling-preview/api/current.ignore
new file mode 100644
index 0000000..b7d9b38
--- /dev/null
+++ b/compose/ui/ui-tooling-preview/api/current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.ui.tooling.preview.datasource.LoremIpsumKt:
+    Removed class androidx.compose.ui.tooling.preview.datasource.LoremIpsumKt
diff --git a/compose/ui/ui-tooling-preview/api/current.txt b/compose/ui/ui-tooling-preview/api/current.txt
index 01e7297..a5363d9 100644
--- a/compose/ui/ui-tooling-preview/api/current.txt
+++ b/compose/ui/ui-tooling-preview/api/current.txt
@@ -109,8 +109,5 @@
     property public kotlin.sequences.Sequence<java.lang.String> values;
   }
 
-  public final class LoremIpsumKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-tooling-preview/api/public_plus_experimental_1.4.0-beta01.txt b/compose/ui/ui-tooling-preview/api/public_plus_experimental_1.4.0-beta01.txt
index 01e7297..a5363d9 100644
--- a/compose/ui/ui-tooling-preview/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/ui/ui-tooling-preview/api/public_plus_experimental_1.4.0-beta01.txt
@@ -109,8 +109,5 @@
     property public kotlin.sequences.Sequence<java.lang.String> values;
   }
 
-  public final class LoremIpsumKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-tooling-preview/api/public_plus_experimental_current.txt b/compose/ui/ui-tooling-preview/api/public_plus_experimental_current.txt
index 01e7297..a5363d9 100644
--- a/compose/ui/ui-tooling-preview/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-tooling-preview/api/public_plus_experimental_current.txt
@@ -109,8 +109,5 @@
     property public kotlin.sequences.Sequence<java.lang.String> values;
   }
 
-  public final class LoremIpsumKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-tooling-preview/api/restricted_1.4.0-beta01.txt b/compose/ui/ui-tooling-preview/api/restricted_1.4.0-beta01.txt
index 01e7297..a5363d9 100644
--- a/compose/ui/ui-tooling-preview/api/restricted_1.4.0-beta01.txt
+++ b/compose/ui/ui-tooling-preview/api/restricted_1.4.0-beta01.txt
@@ -109,8 +109,5 @@
     property public kotlin.sequences.Sequence<java.lang.String> values;
   }
 
-  public final class LoremIpsumKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-tooling-preview/api/restricted_current.ignore b/compose/ui/ui-tooling-preview/api/restricted_current.ignore
new file mode 100644
index 0000000..b7d9b38
--- /dev/null
+++ b/compose/ui/ui-tooling-preview/api/restricted_current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.compose.ui.tooling.preview.datasource.LoremIpsumKt:
+    Removed class androidx.compose.ui.tooling.preview.datasource.LoremIpsumKt
diff --git a/compose/ui/ui-tooling-preview/api/restricted_current.txt b/compose/ui/ui-tooling-preview/api/restricted_current.txt
index 01e7297..a5363d9 100644
--- a/compose/ui/ui-tooling-preview/api/restricted_current.txt
+++ b/compose/ui/ui-tooling-preview/api/restricted_current.txt
@@ -109,8 +109,5 @@
     property public kotlin.sequences.Sequence<java.lang.String> values;
   }
 
-  public final class LoremIpsumKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-tooling/api/1.4.0-beta01.txt b/compose/ui/ui-tooling/api/1.4.0-beta01.txt
index d19be8b..94b79be 100644
--- a/compose/ui/ui-tooling/api/1.4.0-beta01.txt
+++ b/compose/ui/ui-tooling/api/1.4.0-beta01.txt
@@ -1,35 +1,14 @@
 // Signature format: 4.0
 package androidx.compose.ui.tooling {
 
-  public final class ComposeViewAdapterKt {
-  }
-
   public final class InspectableKt {
     method @Deprecated @androidx.compose.runtime.Composable public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class PreviewLogger_androidKt {
-  }
-
-  public final class PreviewUtilsKt {
-  }
-
-  public final class ShadowViewInfoKt {
-  }
-
-  public final class ViewInfoUtilKt {
-  }
-
 }
 
 package androidx.compose.ui.tooling.animation {
 
-  public final class AnimatedVisibilityComposeAnimationKt {
-  }
-
-  public final class AnimationSearchKt {
-  }
-
   public final class ToolingState<T> implements androidx.compose.runtime.State<T> {
     ctor public ToolingState(T? default);
     method public T! getValue();
@@ -37,15 +16,5 @@
     property public T! value;
   }
 
-  public final class TransitionComposeAnimationKt {
-  }
-
-}
-
-package androidx.compose.ui.tooling.animation.clock {
-
-  public final class UtilsKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-tooling/api/current.ignore b/compose/ui/ui-tooling/api/current.ignore
index fd7c564..5c14f2e 100644
--- a/compose/ui/ui-tooling/api/current.ignore
+++ b/compose/ui/ui-tooling/api/current.ignore
@@ -1,3 +1,7 @@
 // Baseline format: 1.0
+RemovedClass: androidx.compose.ui.tooling.ComposeViewAdapterKt:
+    Removed class androidx.compose.ui.tooling.ComposeViewAdapterKt
+RemovedClass: androidx.compose.ui.tooling.PreviewUtilsKt:
+    Removed class androidx.compose.ui.tooling.PreviewUtilsKt
 RemovedClass: androidx.compose.ui.tooling.animation.ComposeAnimationParserKt:
     Removed class androidx.compose.ui.tooling.animation.ComposeAnimationParserKt
diff --git a/compose/ui/ui-tooling/api/current.txt b/compose/ui/ui-tooling/api/current.txt
index d19be8b..94b79be 100644
--- a/compose/ui/ui-tooling/api/current.txt
+++ b/compose/ui/ui-tooling/api/current.txt
@@ -1,35 +1,14 @@
 // Signature format: 4.0
 package androidx.compose.ui.tooling {
 
-  public final class ComposeViewAdapterKt {
-  }
-
   public final class InspectableKt {
     method @Deprecated @androidx.compose.runtime.Composable public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class PreviewLogger_androidKt {
-  }
-
-  public final class PreviewUtilsKt {
-  }
-
-  public final class ShadowViewInfoKt {
-  }
-
-  public final class ViewInfoUtilKt {
-  }
-
 }
 
 package androidx.compose.ui.tooling.animation {
 
-  public final class AnimatedVisibilityComposeAnimationKt {
-  }
-
-  public final class AnimationSearchKt {
-  }
-
   public final class ToolingState<T> implements androidx.compose.runtime.State<T> {
     ctor public ToolingState(T? default);
     method public T! getValue();
@@ -37,15 +16,5 @@
     property public T! value;
   }
 
-  public final class TransitionComposeAnimationKt {
-  }
-
-}
-
-package androidx.compose.ui.tooling.animation.clock {
-
-  public final class UtilsKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-tooling/api/public_plus_experimental_1.4.0-beta01.txt b/compose/ui/ui-tooling/api/public_plus_experimental_1.4.0-beta01.txt
index d26bb08..e9656ce 100644
--- a/compose/ui/ui-tooling/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/ui/ui-tooling/api/public_plus_experimental_1.4.0-beta01.txt
@@ -6,35 +6,14 @@
     field @Deprecated public static final androidx.compose.ui.tooling.ComposableInvoker INSTANCE;
   }
 
-  public final class ComposeViewAdapterKt {
-  }
-
   public final class InspectableKt {
     method @Deprecated @androidx.compose.runtime.Composable public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class PreviewLogger_androidKt {
-  }
-
-  public final class PreviewUtilsKt {
-  }
-
-  public final class ShadowViewInfoKt {
-  }
-
-  public final class ViewInfoUtilKt {
-  }
-
 }
 
 package androidx.compose.ui.tooling.animation {
 
-  public final class AnimatedVisibilityComposeAnimationKt {
-  }
-
-  public final class AnimationSearchKt {
-  }
-
   public final class ToolingState<T> implements androidx.compose.runtime.State<T> {
     ctor public ToolingState(T? default);
     method public T! getValue();
@@ -42,15 +21,5 @@
     property public T! value;
   }
 
-  public final class TransitionComposeAnimationKt {
-  }
-
-}
-
-package androidx.compose.ui.tooling.animation.clock {
-
-  public final class UtilsKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-tooling/api/public_plus_experimental_current.txt b/compose/ui/ui-tooling/api/public_plus_experimental_current.txt
index d26bb08..e9656ce 100644
--- a/compose/ui/ui-tooling/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-tooling/api/public_plus_experimental_current.txt
@@ -6,35 +6,14 @@
     field @Deprecated public static final androidx.compose.ui.tooling.ComposableInvoker INSTANCE;
   }
 
-  public final class ComposeViewAdapterKt {
-  }
-
   public final class InspectableKt {
     method @Deprecated @androidx.compose.runtime.Composable public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class PreviewLogger_androidKt {
-  }
-
-  public final class PreviewUtilsKt {
-  }
-
-  public final class ShadowViewInfoKt {
-  }
-
-  public final class ViewInfoUtilKt {
-  }
-
 }
 
 package androidx.compose.ui.tooling.animation {
 
-  public final class AnimatedVisibilityComposeAnimationKt {
-  }
-
-  public final class AnimationSearchKt {
-  }
-
   public final class ToolingState<T> implements androidx.compose.runtime.State<T> {
     ctor public ToolingState(T? default);
     method public T! getValue();
@@ -42,15 +21,5 @@
     property public T! value;
   }
 
-  public final class TransitionComposeAnimationKt {
-  }
-
-}
-
-package androidx.compose.ui.tooling.animation.clock {
-
-  public final class UtilsKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-tooling/api/restricted_1.4.0-beta01.txt b/compose/ui/ui-tooling/api/restricted_1.4.0-beta01.txt
index d19be8b..94b79be 100644
--- a/compose/ui/ui-tooling/api/restricted_1.4.0-beta01.txt
+++ b/compose/ui/ui-tooling/api/restricted_1.4.0-beta01.txt
@@ -1,35 +1,14 @@
 // Signature format: 4.0
 package androidx.compose.ui.tooling {
 
-  public final class ComposeViewAdapterKt {
-  }
-
   public final class InspectableKt {
     method @Deprecated @androidx.compose.runtime.Composable public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class PreviewLogger_androidKt {
-  }
-
-  public final class PreviewUtilsKt {
-  }
-
-  public final class ShadowViewInfoKt {
-  }
-
-  public final class ViewInfoUtilKt {
-  }
-
 }
 
 package androidx.compose.ui.tooling.animation {
 
-  public final class AnimatedVisibilityComposeAnimationKt {
-  }
-
-  public final class AnimationSearchKt {
-  }
-
   public final class ToolingState<T> implements androidx.compose.runtime.State<T> {
     ctor public ToolingState(T? default);
     method public T! getValue();
@@ -37,15 +16,5 @@
     property public T! value;
   }
 
-  public final class TransitionComposeAnimationKt {
-  }
-
-}
-
-package androidx.compose.ui.tooling.animation.clock {
-
-  public final class UtilsKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-tooling/api/restricted_current.ignore b/compose/ui/ui-tooling/api/restricted_current.ignore
index fd7c564..5c14f2e 100644
--- a/compose/ui/ui-tooling/api/restricted_current.ignore
+++ b/compose/ui/ui-tooling/api/restricted_current.ignore
@@ -1,3 +1,7 @@
 // Baseline format: 1.0
+RemovedClass: androidx.compose.ui.tooling.ComposeViewAdapterKt:
+    Removed class androidx.compose.ui.tooling.ComposeViewAdapterKt
+RemovedClass: androidx.compose.ui.tooling.PreviewUtilsKt:
+    Removed class androidx.compose.ui.tooling.PreviewUtilsKt
 RemovedClass: androidx.compose.ui.tooling.animation.ComposeAnimationParserKt:
     Removed class androidx.compose.ui.tooling.animation.ComposeAnimationParserKt
diff --git a/compose/ui/ui-tooling/api/restricted_current.txt b/compose/ui/ui-tooling/api/restricted_current.txt
index d19be8b..94b79be 100644
--- a/compose/ui/ui-tooling/api/restricted_current.txt
+++ b/compose/ui/ui-tooling/api/restricted_current.txt
@@ -1,35 +1,14 @@
 // Signature format: 4.0
 package androidx.compose.ui.tooling {
 
-  public final class ComposeViewAdapterKt {
-  }
-
   public final class InspectableKt {
     method @Deprecated @androidx.compose.runtime.Composable public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
 
-  public final class PreviewLogger_androidKt {
-  }
-
-  public final class PreviewUtilsKt {
-  }
-
-  public final class ShadowViewInfoKt {
-  }
-
-  public final class ViewInfoUtilKt {
-  }
-
 }
 
 package androidx.compose.ui.tooling.animation {
 
-  public final class AnimatedVisibilityComposeAnimationKt {
-  }
-
-  public final class AnimationSearchKt {
-  }
-
   public final class ToolingState<T> implements androidx.compose.runtime.State<T> {
     ctor public ToolingState(T? default);
     method public T! getValue();
@@ -37,15 +16,5 @@
     property public T! value;
   }
 
-  public final class TransitionComposeAnimationKt {
-  }
-
-}
-
-package androidx.compose.ui.tooling.animation.clock {
-
-  public final class UtilsKt {
-  }
-
 }
 
diff --git a/compose/ui/ui-unit/api/1.4.0-beta01.txt b/compose/ui/ui-unit/api/1.4.0-beta01.txt
index 8c0257c..3826e65 100644
--- a/compose/ui/ui-unit/api/1.4.0-beta01.txt
+++ b/compose/ui/ui-unit/api/1.4.0-beta01.txt
@@ -412,10 +412,3 @@
 
 }
 
-package androidx.compose.ui.unit.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/ui/ui-unit/api/current.ignore b/compose/ui/ui-unit/api/current.ignore
new file mode 100644
index 0000000..9db0c14
--- /dev/null
+++ b/compose/ui/ui-unit/api/current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedPackage: androidx.compose.ui.unit.internal:
+    Removed package androidx.compose.ui.unit.internal
diff --git a/compose/ui/ui-unit/api/current.txt b/compose/ui/ui-unit/api/current.txt
index 8c0257c..3826e65 100644
--- a/compose/ui/ui-unit/api/current.txt
+++ b/compose/ui/ui-unit/api/current.txt
@@ -412,10 +412,3 @@
 
 }
 
-package androidx.compose.ui.unit.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/ui/ui-unit/api/public_plus_experimental_1.4.0-beta01.txt b/compose/ui/ui-unit/api/public_plus_experimental_1.4.0-beta01.txt
index cdfac57..b5b90002 100644
--- a/compose/ui/ui-unit/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/ui/ui-unit/api/public_plus_experimental_1.4.0-beta01.txt
@@ -415,10 +415,3 @@
 
 }
 
-package androidx.compose.ui.unit.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/ui/ui-unit/api/public_plus_experimental_current.txt b/compose/ui/ui-unit/api/public_plus_experimental_current.txt
index cdfac57..b5b90002 100644
--- a/compose/ui/ui-unit/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-unit/api/public_plus_experimental_current.txt
@@ -415,10 +415,3 @@
 
 }
 
-package androidx.compose.ui.unit.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/ui/ui-unit/api/restricted_1.4.0-beta01.txt b/compose/ui/ui-unit/api/restricted_1.4.0-beta01.txt
index c5ff9fa..4572e24 100644
--- a/compose/ui/ui-unit/api/restricted_1.4.0-beta01.txt
+++ b/compose/ui/ui-unit/api/restricted_1.4.0-beta01.txt
@@ -417,10 +417,3 @@
 
 }
 
-package androidx.compose.ui.unit.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/ui/ui-unit/api/restricted_current.ignore b/compose/ui/ui-unit/api/restricted_current.ignore
new file mode 100644
index 0000000..9db0c14
--- /dev/null
+++ b/compose/ui/ui-unit/api/restricted_current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedPackage: androidx.compose.ui.unit.internal:
+    Removed package androidx.compose.ui.unit.internal
diff --git a/compose/ui/ui-unit/api/restricted_current.txt b/compose/ui/ui-unit/api/restricted_current.txt
index c5ff9fa..4572e24 100644
--- a/compose/ui/ui-unit/api/restricted_current.txt
+++ b/compose/ui/ui-unit/api/restricted_current.txt
@@ -417,10 +417,3 @@
 
 }
 
-package androidx.compose.ui.unit.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
diff --git a/compose/ui/ui/api/1.4.0-beta01.txt b/compose/ui/ui/api/1.4.0-beta01.txt
index 4eea595..28acb26 100644
--- a/compose/ui/ui/api/1.4.0-beta01.txt
+++ b/compose/ui/ui/api/1.4.0-beta01.txt
@@ -21,9 +21,6 @@
     field public static final androidx.compose.ui.AbsoluteAlignment INSTANCE;
   }
 
-  public final class ActualKt {
-  }
-
   @androidx.compose.runtime.Stable public fun interface Alignment {
     method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
     field public static final androidx.compose.ui.Alignment.Companion Companion;
@@ -153,9 +150,6 @@
   public static final class MotionDurationScale.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.MotionDurationScale> {
   }
 
-  public final class TempListUtilsKt {
-  }
-
   @androidx.compose.runtime.ComposableTargetMarker(description="UI Composable") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface UiComposable {
   }
 
@@ -165,16 +159,6 @@
 
 }
 
-package androidx.compose.ui.autofill {
-
-  public final class AndroidAutofillType_androidKt {
-  }
-
-  public final class AndroidAutofill_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.draw {
 
   public final class AlphaKt {
@@ -266,9 +250,6 @@
 
 package androidx.compose.ui.focus {
 
-  public final class BeyondBoundsLayoutKt {
-  }
-
   public final class FocusChangedModifierKt {
     method public static androidx.compose.ui.Modifier onFocusChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusChanged);
   }
@@ -300,9 +281,6 @@
     method public static androidx.compose.ui.Modifier onFocusEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusEvent);
   }
 
-  public final class FocusEventModifierNodeKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface FocusManager {
     method public void clearFocus(optional boolean force);
     method public boolean moveFocus(int focusDirection);
@@ -398,9 +376,6 @@
     property public final androidx.compose.ui.focus.FocusRequester Default;
   }
 
-  public final class FocusRequesterKt {
-  }
-
   @Deprecated @kotlin.jvm.JvmDefaultWithCompatibility public interface FocusRequesterModifier extends androidx.compose.ui.Modifier.Element {
     method @Deprecated public androidx.compose.ui.focus.FocusRequester getFocusRequester();
     property public abstract androidx.compose.ui.focus.FocusRequester focusRequester;
@@ -422,18 +397,6 @@
     property public abstract boolean isFocused;
   }
 
-  public final class FocusTransactionsKt {
-  }
-
-  public final class FocusTraversalKt {
-  }
-
-  public final class OneDimensionalFocusSearchKt {
-  }
-
-  public final class TwoDimensionalFocusSearchKt {
-  }
-
 }
 
 package androidx.compose.ui.graphics {
@@ -785,13 +748,6 @@
 
 }
 
-package androidx.compose.ui.graphics.vector.compat {
-
-  public final class XmlVectorParser_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.hapticfeedback {
 
   public interface HapticFeedback {
@@ -1483,9 +1439,6 @@
     method public static androidx.compose.ui.Modifier nestedScroll(androidx.compose.ui.Modifier, androidx.compose.ui.input.nestedscroll.NestedScrollConnection connection, optional androidx.compose.ui.input.nestedscroll.NestedScrollDispatcher? dispatcher);
   }
 
-  public final class NestedScrollModifierLocalKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class NestedScrollSource {
     field public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource.Companion Companion;
   }
@@ -1682,9 +1635,6 @@
     property public final long uptimeMillis;
   }
 
-  public final class PointerInputEventProcessorKt {
-  }
-
   public abstract class PointerInputFilter {
     ctor public PointerInputFilter();
     method public boolean getInterceptOutOfBoundsChildEvents();
@@ -1713,15 +1663,9 @@
     property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
   }
 
-  public final class PointerInputTestUtilKt {
-  }
-
   public final class PointerInteropFilter_androidKt {
   }
 
-  public final class PointerInteropUtils_androidKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class PointerKeyboardModifiers {
     ctor public PointerKeyboardModifiers(int packedValue);
   }
@@ -1794,13 +1738,6 @@
 
 }
 
-package androidx.compose.ui.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.layout {
 
   @androidx.compose.runtime.Immutable public abstract sealed class AlignmentLine {
@@ -1873,9 +1810,6 @@
     property public final androidx.compose.ui.layout.FixedScale None;
   }
 
-  public final class ContentScaleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class FixedScale implements androidx.compose.ui.layout.ContentScale {
     ctor public FixedScale(float value);
     method public float component1();
@@ -1993,9 +1927,6 @@
     method public static androidx.compose.ui.Modifier layout(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function3<? super androidx.compose.ui.layout.MeasureScope,? super androidx.compose.ui.layout.Measurable,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measure);
   }
 
-  public final class LookaheadLayoutCoordinatesKt {
-  }
-
   public final class LookaheadLayoutKt {
   }
 
@@ -2053,9 +1984,6 @@
     method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable>> measurables, int height);
   }
 
-  public final class MultiContentMeasurePolicyKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface OnGloballyPositionedModifier extends androidx.compose.ui.Modifier.Element {
     method public void onGloballyPositioned(androidx.compose.ui.layout.LayoutCoordinates coordinates);
   }
@@ -2134,9 +2062,6 @@
     property protected abstract int parentWidth;
   }
 
-  public final class PlaceableKt {
-  }
-
   public final class RelocationModifierKt {
   }
 
@@ -2269,60 +2194,24 @@
 
 package androidx.compose.ui.node {
 
-  public final class BackwardsCompatNodeKt {
-  }
-
   public final class DelegatableNodeKt {
   }
 
   public final class DrawModifierNodeKt {
   }
 
-  public final class HitTestResultKt {
-  }
-
-  public final class LayoutModifierNodeCoordinatorKt {
-  }
-
   public final class LayoutModifierNodeKt {
   }
 
-  public final class LayoutNodeDrawScopeKt {
-  }
-
-  public final class LayoutNodeKt {
-  }
-
-  public final class LayoutNodeLayoutDelegateKt {
-  }
-
-  public final class MeasureScopeWithLayoutNodeKt {
-  }
-
   public final class ModifierNodeElementKt {
   }
 
-  public final class MyersDiffKt {
-  }
-
-  public final class NodeChainKt {
-  }
-
-  public final class NodeCoordinatorKt {
-  }
-
-  public final class NodeKindKt {
-  }
-
   public final class ObserverNodeKt {
   }
 
   public final class ParentDataModifierNodeKt {
   }
 
-  public final class PointerInputModifierNodeKt {
-  }
-
   public final class Ref<T> {
     ctor public Ref();
     method public T? getValue();
@@ -2374,12 +2263,6 @@
     method public long calculateRecommendedTimeoutMillis(long originalTimeoutMillis, optional boolean containsIcons, optional boolean containsText, optional boolean containsControls);
   }
 
-  public final class AndroidClipboardManager_androidKt {
-  }
-
-  public final class AndroidComposeViewAccessibilityDelegateCompat_androidKt {
-  }
-
   public final class AndroidComposeView_androidKt {
   }
 
@@ -2412,9 +2295,6 @@
     property public final kotlin.coroutines.CoroutineContext Main;
   }
 
-  public final class AndroidUiDispatcher_androidKt {
-  }
-
   public final class AndroidUiFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
     method public android.view.Choreographer getChoreographer();
@@ -2483,12 +2363,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> LocalWindowInfo;
   }
 
-  public final class DebugUtilsKt {
-  }
-
-  public final class DisposableSaveableStateRegistry_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface InfiniteAnimationPolicy extends kotlin.coroutines.CoroutineContext.Element {
     method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
     method public suspend <R> Object? onInfiniteOperation(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
@@ -2499,9 +2373,6 @@
   public static final class InfiniteAnimationPolicy.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.platform.InfiniteAnimationPolicy> {
   }
 
-  public final class InfiniteAnimationPolicyKt {
-  }
-
   public final class InspectableModifier extends androidx.compose.ui.platform.InspectorValueInfo implements androidx.compose.ui.Modifier.Element {
     ctor public InspectableModifier(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo);
     method public androidx.compose.ui.platform.InspectableModifier.End getEnd();
@@ -2555,19 +2426,10 @@
     property public Object? valueOverride;
   }
 
-  public final class InvertMatrixKt {
-  }
-
-  public final class JvmActuals_jvmKt {
-  }
-
   public final class NestedScrollInteropConnectionKt {
     method @androidx.compose.runtime.Composable public static androidx.compose.ui.input.nestedscroll.NestedScrollConnection rememberNestedScrollInteropConnection(optional android.view.View hostView);
   }
 
-  public final class ShapeContainingUtilKt {
-  }
-
   public final class TestTagKt {
     method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier testTag(androidx.compose.ui.Modifier, String tag);
   }
@@ -2638,9 +2500,6 @@
     field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed INSTANCE;
   }
 
-  public final class ViewCompositionStrategy_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ViewConfiguration {
     method public long getDoubleTapMinTimeMillis();
     method public long getDoubleTapTimeoutMillis();
@@ -2683,25 +2542,12 @@
     property public abstract boolean isWindowFocused;
   }
 
-  public final class WindowInfoKt {
-  }
-
   public final class WindowRecomposer_androidKt {
     method public static androidx.compose.runtime.CompositionContext? findViewTreeCompositionContext(android.view.View);
     method public static androidx.compose.runtime.CompositionContext? getCompositionContext(android.view.View);
     method public static void setCompositionContext(android.view.View, androidx.compose.runtime.CompositionContext?);
   }
 
-  public final class Wrapper_androidKt {
-  }
-
-}
-
-package androidx.compose.ui.platform.accessibility {
-
-  public final class CollectionInfoKt {
-  }
-
 }
 
 package androidx.compose.ui.res {
@@ -2730,9 +2576,6 @@
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static int integerResource(@IntegerRes int id);
   }
 
-  public final class Resources_androidKt {
-  }
-
   public final class StringResources_androidKt {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String pluralStringResource(@PluralsRes int id, int count);
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String pluralStringResource(@PluralsRes int id, int count, java.lang.Object... formatArgs);
@@ -2953,9 +2796,6 @@
     property public final androidx.compose.ui.geometry.Rect touchBoundsInRoot;
   }
 
-  public final class SemanticsNodeKt {
-  }
-
   public final class SemanticsOwner {
     method public androidx.compose.ui.semantics.SemanticsNode getRootSemanticsNode();
     method public androidx.compose.ui.semantics.SemanticsNode getUnmergedRootSemanticsNode();
@@ -3113,9 +2953,6 @@
     method public operator <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
   }
 
-  public final class SemanticsSortKt {
-  }
-
 }
 
 package androidx.compose.ui.state {
@@ -3141,27 +2978,8 @@
 
 }
 
-package androidx.compose.ui.text.input {
-
-  public final class CursorAnchorInfoBuilderKt {
-  }
-
-  public final class InputState_androidKt {
-  }
-
-  public final class RecordingInputConnection_androidKt {
-  }
-
-  public final class TextInputServiceAndroid_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.viewinterop {
 
-  public final class AndroidViewHolder_androidKt {
-  }
-
   public final class AndroidView_androidKt {
     method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static <T extends android.view.View> void AndroidView(kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
     method public static kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> getNoOpUpdate();
@@ -3232,8 +3050,5 @@
     enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOn;
   }
 
-  public final class SecureFlagPolicy_androidKt {
-  }
-
 }
 
diff --git a/compose/ui/ui/api/current.ignore b/compose/ui/ui/api/current.ignore
index b9629b2..bf19fb4 100644
--- a/compose/ui/ui/api/current.ignore
+++ b/compose/ui/ui/api/current.ignore
@@ -3,5 +3,107 @@
     Attempted to remove @NonNull annotation from method androidx.compose.ui.graphics.GraphicsLayerModifierKt.graphicsLayer(androidx.compose.ui.Modifier,float,float,float,float,float,float,float,float,float,float,long,androidx.compose.ui.graphics.Shape,boolean,androidx.compose.ui.graphics.RenderEffect,long,long)
 
 
+RemovedClass: androidx.compose.ui.ActualKt:
+    Removed class androidx.compose.ui.ActualKt
+RemovedClass: androidx.compose.ui.TempListUtilsKt:
+    Removed class androidx.compose.ui.TempListUtilsKt
+RemovedClass: androidx.compose.ui.focus.BeyondBoundsLayoutKt:
+    Removed class androidx.compose.ui.focus.BeyondBoundsLayoutKt
 RemovedClass: androidx.compose.ui.focus.FocusManagerKt:
     Removed class androidx.compose.ui.focus.FocusManagerKt
+RemovedClass: androidx.compose.ui.focus.FocusRequesterKt:
+    Removed class androidx.compose.ui.focus.FocusRequesterKt
+RemovedClass: androidx.compose.ui.focus.FocusTransactionsKt:
+    Removed class androidx.compose.ui.focus.FocusTransactionsKt
+RemovedClass: androidx.compose.ui.focus.FocusTraversalKt:
+    Removed class androidx.compose.ui.focus.FocusTraversalKt
+RemovedClass: androidx.compose.ui.focus.OneDimensionalFocusSearchKt:
+    Removed class androidx.compose.ui.focus.OneDimensionalFocusSearchKt
+RemovedClass: androidx.compose.ui.focus.TwoDimensionalFocusSearchKt:
+    Removed class androidx.compose.ui.focus.TwoDimensionalFocusSearchKt
+RemovedClass: androidx.compose.ui.input.nestedscroll.NestedScrollModifierLocalKt:
+    Removed class androidx.compose.ui.input.nestedscroll.NestedScrollModifierLocalKt
+RemovedClass: androidx.compose.ui.input.pointer.PointerInputEventProcessorKt:
+    Removed class androidx.compose.ui.input.pointer.PointerInputEventProcessorKt
+RemovedClass: androidx.compose.ui.input.pointer.PointerInputTestUtilKt:
+    Removed class androidx.compose.ui.input.pointer.PointerInputTestUtilKt
+RemovedClass: androidx.compose.ui.input.pointer.PointerInteropUtils_androidKt:
+    Removed class androidx.compose.ui.input.pointer.PointerInteropUtils_androidKt
+RemovedClass: androidx.compose.ui.layout.ContentScaleKt:
+    Removed class androidx.compose.ui.layout.ContentScaleKt
+RemovedClass: androidx.compose.ui.layout.LookaheadLayoutCoordinatesKt:
+    Removed class androidx.compose.ui.layout.LookaheadLayoutCoordinatesKt
+RemovedClass: androidx.compose.ui.layout.MultiContentMeasurePolicyKt:
+    Removed class androidx.compose.ui.layout.MultiContentMeasurePolicyKt
+RemovedClass: androidx.compose.ui.layout.PlaceableKt:
+    Removed class androidx.compose.ui.layout.PlaceableKt
+RemovedClass: androidx.compose.ui.node.BackwardsCompatNodeKt:
+    Removed class androidx.compose.ui.node.BackwardsCompatNodeKt
+RemovedClass: androidx.compose.ui.node.HitTestResultKt:
+    Removed class androidx.compose.ui.node.HitTestResultKt
+RemovedClass: androidx.compose.ui.node.LayoutModifierNodeCoordinatorKt:
+    Removed class androidx.compose.ui.node.LayoutModifierNodeCoordinatorKt
+RemovedClass: androidx.compose.ui.node.LayoutNodeDrawScopeKt:
+    Removed class androidx.compose.ui.node.LayoutNodeDrawScopeKt
+RemovedClass: androidx.compose.ui.node.LayoutNodeKt:
+    Removed class androidx.compose.ui.node.LayoutNodeKt
+RemovedClass: androidx.compose.ui.node.LayoutNodeLayoutDelegateKt:
+    Removed class androidx.compose.ui.node.LayoutNodeLayoutDelegateKt
+RemovedClass: androidx.compose.ui.node.MeasureScopeWithLayoutNodeKt:
+    Removed class androidx.compose.ui.node.MeasureScopeWithLayoutNodeKt
+RemovedClass: androidx.compose.ui.node.MyersDiffKt:
+    Removed class androidx.compose.ui.node.MyersDiffKt
+RemovedClass: androidx.compose.ui.node.NodeChainKt:
+    Removed class androidx.compose.ui.node.NodeChainKt
+RemovedClass: androidx.compose.ui.node.NodeCoordinatorKt:
+    Removed class androidx.compose.ui.node.NodeCoordinatorKt
+RemovedClass: androidx.compose.ui.node.NodeKindKt:
+    Removed class androidx.compose.ui.node.NodeKindKt
+RemovedClass: androidx.compose.ui.node.PointerInputModifierNodeKt:
+    Removed class androidx.compose.ui.node.PointerInputModifierNodeKt
+RemovedClass: androidx.compose.ui.platform.AndroidClipboardManager_androidKt:
+    Removed class androidx.compose.ui.platform.AndroidClipboardManager_androidKt
+RemovedClass: androidx.compose.ui.platform.AndroidComposeViewAccessibilityDelegateCompat_androidKt:
+    Removed class androidx.compose.ui.platform.AndroidComposeViewAccessibilityDelegateCompat_androidKt
+RemovedClass: androidx.compose.ui.platform.AndroidUiDispatcher_androidKt:
+    Removed class androidx.compose.ui.platform.AndroidUiDispatcher_androidKt
+RemovedClass: androidx.compose.ui.platform.DebugUtilsKt:
+    Removed class androidx.compose.ui.platform.DebugUtilsKt
+RemovedClass: androidx.compose.ui.platform.DisposableSaveableStateRegistry_androidKt:
+    Removed class androidx.compose.ui.platform.DisposableSaveableStateRegistry_androidKt
+RemovedClass: androidx.compose.ui.platform.InfiniteAnimationPolicyKt:
+    Removed class androidx.compose.ui.platform.InfiniteAnimationPolicyKt
+RemovedClass: androidx.compose.ui.platform.InvertMatrixKt:
+    Removed class androidx.compose.ui.platform.InvertMatrixKt
+RemovedClass: androidx.compose.ui.platform.JvmActuals_jvmKt:
+    Removed class androidx.compose.ui.platform.JvmActuals_jvmKt
+RemovedClass: androidx.compose.ui.platform.ShapeContainingUtilKt:
+    Removed class androidx.compose.ui.platform.ShapeContainingUtilKt
+RemovedClass: androidx.compose.ui.platform.ViewCompositionStrategy_androidKt:
+    Removed class androidx.compose.ui.platform.ViewCompositionStrategy_androidKt
+RemovedClass: androidx.compose.ui.platform.WindowInfoKt:
+    Removed class androidx.compose.ui.platform.WindowInfoKt
+RemovedClass: androidx.compose.ui.platform.Wrapper_androidKt:
+    Removed class androidx.compose.ui.platform.Wrapper_androidKt
+RemovedClass: androidx.compose.ui.res.Resources_androidKt:
+    Removed class androidx.compose.ui.res.Resources_androidKt
+RemovedClass: androidx.compose.ui.semantics.SemanticsNodeKt:
+    Removed class androidx.compose.ui.semantics.SemanticsNodeKt
+RemovedClass: androidx.compose.ui.semantics.SemanticsSortKt:
+    Removed class androidx.compose.ui.semantics.SemanticsSortKt
+RemovedClass: androidx.compose.ui.viewinterop.AndroidViewHolder_androidKt:
+    Removed class androidx.compose.ui.viewinterop.AndroidViewHolder_androidKt
+RemovedClass: androidx.compose.ui.window.SecureFlagPolicy_androidKt:
+    Removed class androidx.compose.ui.window.SecureFlagPolicy_androidKt
+
+
+RemovedPackage: androidx.compose.ui.autofill:
+    Removed package androidx.compose.ui.autofill
+RemovedPackage: androidx.compose.ui.graphics.vector.compat:
+    Removed package androidx.compose.ui.graphics.vector.compat
+RemovedPackage: androidx.compose.ui.internal:
+    Removed package androidx.compose.ui.internal
+RemovedPackage: androidx.compose.ui.platform.accessibility:
+    Removed package androidx.compose.ui.platform.accessibility
+RemovedPackage: androidx.compose.ui.text.input:
+    Removed package androidx.compose.ui.text.input
diff --git a/compose/ui/ui/api/current.txt b/compose/ui/ui/api/current.txt
index 4eea595..28acb26 100644
--- a/compose/ui/ui/api/current.txt
+++ b/compose/ui/ui/api/current.txt
@@ -21,9 +21,6 @@
     field public static final androidx.compose.ui.AbsoluteAlignment INSTANCE;
   }
 
-  public final class ActualKt {
-  }
-
   @androidx.compose.runtime.Stable public fun interface Alignment {
     method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
     field public static final androidx.compose.ui.Alignment.Companion Companion;
@@ -153,9 +150,6 @@
   public static final class MotionDurationScale.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.MotionDurationScale> {
   }
 
-  public final class TempListUtilsKt {
-  }
-
   @androidx.compose.runtime.ComposableTargetMarker(description="UI Composable") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface UiComposable {
   }
 
@@ -165,16 +159,6 @@
 
 }
 
-package androidx.compose.ui.autofill {
-
-  public final class AndroidAutofillType_androidKt {
-  }
-
-  public final class AndroidAutofill_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.draw {
 
   public final class AlphaKt {
@@ -266,9 +250,6 @@
 
 package androidx.compose.ui.focus {
 
-  public final class BeyondBoundsLayoutKt {
-  }
-
   public final class FocusChangedModifierKt {
     method public static androidx.compose.ui.Modifier onFocusChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusChanged);
   }
@@ -300,9 +281,6 @@
     method public static androidx.compose.ui.Modifier onFocusEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusEvent);
   }
 
-  public final class FocusEventModifierNodeKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface FocusManager {
     method public void clearFocus(optional boolean force);
     method public boolean moveFocus(int focusDirection);
@@ -398,9 +376,6 @@
     property public final androidx.compose.ui.focus.FocusRequester Default;
   }
 
-  public final class FocusRequesterKt {
-  }
-
   @Deprecated @kotlin.jvm.JvmDefaultWithCompatibility public interface FocusRequesterModifier extends androidx.compose.ui.Modifier.Element {
     method @Deprecated public androidx.compose.ui.focus.FocusRequester getFocusRequester();
     property public abstract androidx.compose.ui.focus.FocusRequester focusRequester;
@@ -422,18 +397,6 @@
     property public abstract boolean isFocused;
   }
 
-  public final class FocusTransactionsKt {
-  }
-
-  public final class FocusTraversalKt {
-  }
-
-  public final class OneDimensionalFocusSearchKt {
-  }
-
-  public final class TwoDimensionalFocusSearchKt {
-  }
-
 }
 
 package androidx.compose.ui.graphics {
@@ -785,13 +748,6 @@
 
 }
 
-package androidx.compose.ui.graphics.vector.compat {
-
-  public final class XmlVectorParser_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.hapticfeedback {
 
   public interface HapticFeedback {
@@ -1483,9 +1439,6 @@
     method public static androidx.compose.ui.Modifier nestedScroll(androidx.compose.ui.Modifier, androidx.compose.ui.input.nestedscroll.NestedScrollConnection connection, optional androidx.compose.ui.input.nestedscroll.NestedScrollDispatcher? dispatcher);
   }
 
-  public final class NestedScrollModifierLocalKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class NestedScrollSource {
     field public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource.Companion Companion;
   }
@@ -1682,9 +1635,6 @@
     property public final long uptimeMillis;
   }
 
-  public final class PointerInputEventProcessorKt {
-  }
-
   public abstract class PointerInputFilter {
     ctor public PointerInputFilter();
     method public boolean getInterceptOutOfBoundsChildEvents();
@@ -1713,15 +1663,9 @@
     property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
   }
 
-  public final class PointerInputTestUtilKt {
-  }
-
   public final class PointerInteropFilter_androidKt {
   }
 
-  public final class PointerInteropUtils_androidKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class PointerKeyboardModifiers {
     ctor public PointerKeyboardModifiers(int packedValue);
   }
@@ -1794,13 +1738,6 @@
 
 }
 
-package androidx.compose.ui.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.layout {
 
   @androidx.compose.runtime.Immutable public abstract sealed class AlignmentLine {
@@ -1873,9 +1810,6 @@
     property public final androidx.compose.ui.layout.FixedScale None;
   }
 
-  public final class ContentScaleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class FixedScale implements androidx.compose.ui.layout.ContentScale {
     ctor public FixedScale(float value);
     method public float component1();
@@ -1993,9 +1927,6 @@
     method public static androidx.compose.ui.Modifier layout(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function3<? super androidx.compose.ui.layout.MeasureScope,? super androidx.compose.ui.layout.Measurable,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measure);
   }
 
-  public final class LookaheadLayoutCoordinatesKt {
-  }
-
   public final class LookaheadLayoutKt {
   }
 
@@ -2053,9 +1984,6 @@
     method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable>> measurables, int height);
   }
 
-  public final class MultiContentMeasurePolicyKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface OnGloballyPositionedModifier extends androidx.compose.ui.Modifier.Element {
     method public void onGloballyPositioned(androidx.compose.ui.layout.LayoutCoordinates coordinates);
   }
@@ -2134,9 +2062,6 @@
     property protected abstract int parentWidth;
   }
 
-  public final class PlaceableKt {
-  }
-
   public final class RelocationModifierKt {
   }
 
@@ -2269,60 +2194,24 @@
 
 package androidx.compose.ui.node {
 
-  public final class BackwardsCompatNodeKt {
-  }
-
   public final class DelegatableNodeKt {
   }
 
   public final class DrawModifierNodeKt {
   }
 
-  public final class HitTestResultKt {
-  }
-
-  public final class LayoutModifierNodeCoordinatorKt {
-  }
-
   public final class LayoutModifierNodeKt {
   }
 
-  public final class LayoutNodeDrawScopeKt {
-  }
-
-  public final class LayoutNodeKt {
-  }
-
-  public final class LayoutNodeLayoutDelegateKt {
-  }
-
-  public final class MeasureScopeWithLayoutNodeKt {
-  }
-
   public final class ModifierNodeElementKt {
   }
 
-  public final class MyersDiffKt {
-  }
-
-  public final class NodeChainKt {
-  }
-
-  public final class NodeCoordinatorKt {
-  }
-
-  public final class NodeKindKt {
-  }
-
   public final class ObserverNodeKt {
   }
 
   public final class ParentDataModifierNodeKt {
   }
 
-  public final class PointerInputModifierNodeKt {
-  }
-
   public final class Ref<T> {
     ctor public Ref();
     method public T? getValue();
@@ -2374,12 +2263,6 @@
     method public long calculateRecommendedTimeoutMillis(long originalTimeoutMillis, optional boolean containsIcons, optional boolean containsText, optional boolean containsControls);
   }
 
-  public final class AndroidClipboardManager_androidKt {
-  }
-
-  public final class AndroidComposeViewAccessibilityDelegateCompat_androidKt {
-  }
-
   public final class AndroidComposeView_androidKt {
   }
 
@@ -2412,9 +2295,6 @@
     property public final kotlin.coroutines.CoroutineContext Main;
   }
 
-  public final class AndroidUiDispatcher_androidKt {
-  }
-
   public final class AndroidUiFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
     method public android.view.Choreographer getChoreographer();
@@ -2483,12 +2363,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> LocalWindowInfo;
   }
 
-  public final class DebugUtilsKt {
-  }
-
-  public final class DisposableSaveableStateRegistry_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface InfiniteAnimationPolicy extends kotlin.coroutines.CoroutineContext.Element {
     method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
     method public suspend <R> Object? onInfiniteOperation(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
@@ -2499,9 +2373,6 @@
   public static final class InfiniteAnimationPolicy.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.platform.InfiniteAnimationPolicy> {
   }
 
-  public final class InfiniteAnimationPolicyKt {
-  }
-
   public final class InspectableModifier extends androidx.compose.ui.platform.InspectorValueInfo implements androidx.compose.ui.Modifier.Element {
     ctor public InspectableModifier(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo);
     method public androidx.compose.ui.platform.InspectableModifier.End getEnd();
@@ -2555,19 +2426,10 @@
     property public Object? valueOverride;
   }
 
-  public final class InvertMatrixKt {
-  }
-
-  public final class JvmActuals_jvmKt {
-  }
-
   public final class NestedScrollInteropConnectionKt {
     method @androidx.compose.runtime.Composable public static androidx.compose.ui.input.nestedscroll.NestedScrollConnection rememberNestedScrollInteropConnection(optional android.view.View hostView);
   }
 
-  public final class ShapeContainingUtilKt {
-  }
-
   public final class TestTagKt {
     method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier testTag(androidx.compose.ui.Modifier, String tag);
   }
@@ -2638,9 +2500,6 @@
     field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed INSTANCE;
   }
 
-  public final class ViewCompositionStrategy_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ViewConfiguration {
     method public long getDoubleTapMinTimeMillis();
     method public long getDoubleTapTimeoutMillis();
@@ -2683,25 +2542,12 @@
     property public abstract boolean isWindowFocused;
   }
 
-  public final class WindowInfoKt {
-  }
-
   public final class WindowRecomposer_androidKt {
     method public static androidx.compose.runtime.CompositionContext? findViewTreeCompositionContext(android.view.View);
     method public static androidx.compose.runtime.CompositionContext? getCompositionContext(android.view.View);
     method public static void setCompositionContext(android.view.View, androidx.compose.runtime.CompositionContext?);
   }
 
-  public final class Wrapper_androidKt {
-  }
-
-}
-
-package androidx.compose.ui.platform.accessibility {
-
-  public final class CollectionInfoKt {
-  }
-
 }
 
 package androidx.compose.ui.res {
@@ -2730,9 +2576,6 @@
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static int integerResource(@IntegerRes int id);
   }
 
-  public final class Resources_androidKt {
-  }
-
   public final class StringResources_androidKt {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String pluralStringResource(@PluralsRes int id, int count);
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String pluralStringResource(@PluralsRes int id, int count, java.lang.Object... formatArgs);
@@ -2953,9 +2796,6 @@
     property public final androidx.compose.ui.geometry.Rect touchBoundsInRoot;
   }
 
-  public final class SemanticsNodeKt {
-  }
-
   public final class SemanticsOwner {
     method public androidx.compose.ui.semantics.SemanticsNode getRootSemanticsNode();
     method public androidx.compose.ui.semantics.SemanticsNode getUnmergedRootSemanticsNode();
@@ -3113,9 +2953,6 @@
     method public operator <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
   }
 
-  public final class SemanticsSortKt {
-  }
-
 }
 
 package androidx.compose.ui.state {
@@ -3141,27 +2978,8 @@
 
 }
 
-package androidx.compose.ui.text.input {
-
-  public final class CursorAnchorInfoBuilderKt {
-  }
-
-  public final class InputState_androidKt {
-  }
-
-  public final class RecordingInputConnection_androidKt {
-  }
-
-  public final class TextInputServiceAndroid_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.viewinterop {
 
-  public final class AndroidViewHolder_androidKt {
-  }
-
   public final class AndroidView_androidKt {
     method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static <T extends android.view.View> void AndroidView(kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
     method public static kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> getNoOpUpdate();
@@ -3232,8 +3050,5 @@
     enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOn;
   }
 
-  public final class SecureFlagPolicy_androidKt {
-  }
-
 }
 
diff --git a/compose/ui/ui/api/public_plus_experimental_1.4.0-beta01.txt b/compose/ui/ui/api/public_plus_experimental_1.4.0-beta01.txt
index 01283ce..a619ca2 100644
--- a/compose/ui/ui/api/public_plus_experimental_1.4.0-beta01.txt
+++ b/compose/ui/ui/api/public_plus_experimental_1.4.0-beta01.txt
@@ -21,9 +21,6 @@
     field public static final androidx.compose.ui.AbsoluteAlignment INSTANCE;
   }
 
-  public final class ActualKt {
-  }
-
   @androidx.compose.runtime.Stable public fun interface Alignment {
     method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
     field public static final androidx.compose.ui.Alignment.Companion Companion;
@@ -175,9 +172,6 @@
   public static final class MotionDurationScale.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.MotionDurationScale> {
   }
 
-  public final class TempListUtilsKt {
-  }
-
   @androidx.compose.runtime.ComposableTargetMarker(description="UI Composable") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface UiComposable {
   }
 
@@ -189,12 +183,6 @@
 
 package androidx.compose.ui.autofill {
 
-  public final class AndroidAutofillType_androidKt {
-  }
-
-  public final class AndroidAutofill_androidKt {
-  }
-
   @androidx.compose.ui.ExperimentalComposeUiApi public interface Autofill {
     method public void cancelAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
     method public void requestAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
@@ -355,9 +343,6 @@
 
 package androidx.compose.ui.focus {
 
-  public final class BeyondBoundsLayoutKt {
-  }
-
   public final class FocusChangedModifierKt {
     method public static androidx.compose.ui.Modifier onFocusChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusChanged);
   }
@@ -401,9 +386,6 @@
     method public void onFocusEvent(androidx.compose.ui.focus.FocusState focusState);
   }
 
-  public final class FocusEventModifierNodeKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface FocusManager {
     method public void clearFocus(optional boolean force);
     method public boolean moveFocus(int focusDirection);
@@ -532,9 +514,6 @@
     field public static final androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory INSTANCE;
   }
 
-  public final class FocusRequesterKt {
-  }
-
   @Deprecated @kotlin.jvm.JvmDefaultWithCompatibility public interface FocusRequesterModifier extends androidx.compose.ui.Modifier.Element {
     method @Deprecated public androidx.compose.ui.focus.FocusRequester getFocusRequester();
     property public abstract androidx.compose.ui.focus.FocusRequester focusRequester;
@@ -569,18 +548,6 @@
     property public final androidx.compose.ui.focus.FocusState focusState;
   }
 
-  public final class FocusTransactionsKt {
-  }
-
-  public final class FocusTraversalKt {
-  }
-
-  public final class OneDimensionalFocusSearchKt {
-  }
-
-  public final class TwoDimensionalFocusSearchKt {
-  }
-
 }
 
 package androidx.compose.ui.graphics {
@@ -932,13 +899,6 @@
 
 }
 
-package androidx.compose.ui.graphics.vector.compat {
-
-  public final class XmlVectorParser_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.hapticfeedback {
 
   public interface HapticFeedback {
@@ -1636,9 +1596,6 @@
     method public static androidx.compose.ui.Modifier nestedScroll(androidx.compose.ui.Modifier, androidx.compose.ui.input.nestedscroll.NestedScrollConnection connection, optional androidx.compose.ui.input.nestedscroll.NestedScrollDispatcher? dispatcher);
   }
 
-  public final class NestedScrollModifierLocalKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class NestedScrollSource {
     field public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource.Companion Companion;
   }
@@ -1850,9 +1807,6 @@
     property public final long uptimeMillis;
   }
 
-  public final class PointerInputEventProcessorKt {
-  }
-
   public abstract class PointerInputFilter {
     ctor public PointerInputFilter();
     method public boolean getInterceptOutOfBoundsChildEvents();
@@ -1883,17 +1837,11 @@
     property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
   }
 
-  public final class PointerInputTestUtilKt {
-  }
-
   public final class PointerInteropFilter_androidKt {
     method @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.ui.Modifier motionEventSpy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super android.view.MotionEvent,kotlin.Unit> watcher);
     method @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.ui.Modifier pointerInteropFilter(androidx.compose.ui.Modifier, optional androidx.compose.ui.input.pointer.RequestDisallowInterceptTouchEvent? requestDisallowInterceptTouchEvent, kotlin.jvm.functions.Function1<? super android.view.MotionEvent,java.lang.Boolean> onTouchEvent);
   }
 
-  public final class PointerInteropUtils_androidKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class PointerKeyboardModifiers {
     ctor public PointerKeyboardModifiers(int packedValue);
   }
@@ -1976,13 +1924,6 @@
 
 }
 
-package androidx.compose.ui.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.layout {
 
   @androidx.compose.runtime.Immutable public abstract sealed class AlignmentLine {
@@ -2055,9 +1996,6 @@
     property public final androidx.compose.ui.layout.FixedScale None;
   }
 
-  public final class ContentScaleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class FixedScale implements androidx.compose.ui.layout.ContentScale {
     ctor public FixedScale(float value);
     method public float component1();
@@ -2179,9 +2117,6 @@
     method public long localLookaheadPositionOf(androidx.compose.ui.layout.LookaheadLayoutCoordinates sourceCoordinates, optional long relativeToSource);
   }
 
-  public final class LookaheadLayoutCoordinatesKt {
-  }
-
   public final class LookaheadLayoutKt {
     method @androidx.compose.runtime.Composable @androidx.compose.ui.ExperimentalComposeUiApi @androidx.compose.ui.UiComposable public static void LookaheadLayout(kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LookaheadLayoutScope,kotlin.Unit> content, optional androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
   }
@@ -2245,9 +2180,6 @@
     method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable>> measurables, int height);
   }
 
-  public final class MultiContentMeasurePolicyKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface OnGloballyPositionedModifier extends androidx.compose.ui.Modifier.Element {
     method public void onGloballyPositioned(androidx.compose.ui.layout.LayoutCoordinates coordinates);
   }
@@ -2328,9 +2260,6 @@
     property protected abstract int parentWidth;
   }
 
-  public final class PlaceableKt {
-  }
-
   @Deprecated @androidx.compose.ui.ExperimentalComposeUiApi @kotlin.jvm.JvmDefaultWithCompatibility public interface RelocationModifier extends androidx.compose.ui.Modifier.Element {
     method @Deprecated public androidx.compose.ui.geometry.Rect computeDestination(androidx.compose.ui.geometry.Rect source, androidx.compose.ui.layout.LayoutCoordinates layoutCoordinates);
     method @Deprecated public suspend Object? performRelocation(androidx.compose.ui.geometry.Rect source, androidx.compose.ui.geometry.Rect destination, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -2492,9 +2421,6 @@
 
 package androidx.compose.ui.node {
 
-  public final class BackwardsCompatNodeKt {
-  }
-
   @androidx.compose.ui.ExperimentalComposeUiApi public interface DelegatableNode {
     method public androidx.compose.ui.Modifier.Node getNode();
     property public abstract androidx.compose.ui.Modifier.Node node;
@@ -2522,9 +2448,6 @@
     method public void onGloballyPositioned(androidx.compose.ui.layout.LayoutCoordinates coordinates);
   }
 
-  public final class HitTestResultKt {
-  }
-
   @androidx.compose.ui.ExperimentalComposeUiApi public interface IntermediateLayoutModifierNode extends androidx.compose.ui.node.LayoutModifierNode {
     method public long getTargetSize();
     method public void setTargetSize(long);
@@ -2549,27 +2472,12 @@
     method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
   }
 
-  public final class LayoutModifierNodeCoordinatorKt {
-  }
-
   public final class LayoutModifierNodeKt {
     method @androidx.compose.ui.ExperimentalComposeUiApi public static void invalidateLayer(androidx.compose.ui.node.LayoutModifierNode);
     method @androidx.compose.ui.ExperimentalComposeUiApi public static void invalidateLayout(androidx.compose.ui.node.LayoutModifierNode);
     method @androidx.compose.ui.ExperimentalComposeUiApi public static void invalidateMeasurements(androidx.compose.ui.node.LayoutModifierNode);
   }
 
-  public final class LayoutNodeDrawScopeKt {
-  }
-
-  public final class LayoutNodeKt {
-  }
-
-  public final class LayoutNodeLayoutDelegateKt {
-  }
-
-  public final class MeasureScopeWithLayoutNodeKt {
-  }
-
   @androidx.compose.ui.ExperimentalComposeUiApi public abstract class ModifierNodeElement<N extends androidx.compose.ui.Modifier.Node> extends androidx.compose.ui.platform.InspectorValueInfo implements androidx.compose.ui.Modifier.Element {
     ctor public ModifierNodeElement(optional Object? params, optional boolean autoInvalidate, kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo);
     method public abstract N create();
@@ -2581,18 +2489,6 @@
     method @androidx.compose.ui.ExperimentalComposeUiApi public static inline <reified T extends androidx.compose.ui.Modifier.Node> androidx.compose.ui.Modifier modifierElementOf(kotlin.jvm.functions.Function0<? extends T> create, kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,? extends kotlin.Unit> definitions);
   }
 
-  public final class MyersDiffKt {
-  }
-
-  public final class NodeChainKt {
-  }
-
-  public final class NodeCoordinatorKt {
-  }
-
-  public final class NodeKindKt {
-  }
-
   @androidx.compose.ui.ExperimentalComposeUiApi public interface ObserverNode extends androidx.compose.ui.node.DelegatableNode {
     method public void onObservedReadsChanged();
   }
@@ -2616,9 +2512,6 @@
     method public default boolean sharePointerInputWithSiblings();
   }
 
-  public final class PointerInputModifierNodeKt {
-  }
-
   public final class Ref<T> {
     ctor public Ref();
     method public T? getValue();
@@ -2678,12 +2571,6 @@
     method public long calculateRecommendedTimeoutMillis(long originalTimeoutMillis, optional boolean containsIcons, optional boolean containsText, optional boolean containsControls);
   }
 
-  public final class AndroidClipboardManager_androidKt {
-  }
-
-  public final class AndroidComposeViewAccessibilityDelegateCompat_androidKt {
-  }
-
   public final class AndroidComposeView_androidKt {
   }
 
@@ -2716,9 +2603,6 @@
     property public final kotlin.coroutines.CoroutineContext Main;
   }
 
-  public final class AndroidUiDispatcher_androidKt {
-  }
-
   public final class AndroidUiFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
     method public android.view.Choreographer getChoreographer();
@@ -2791,12 +2675,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> LocalWindowInfo;
   }
 
-  public final class DebugUtilsKt {
-  }
-
-  public final class DisposableSaveableStateRegistry_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface InfiniteAnimationPolicy extends kotlin.coroutines.CoroutineContext.Element {
     method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
     method public suspend <R> Object? onInfiniteOperation(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
@@ -2807,9 +2685,6 @@
   public static final class InfiniteAnimationPolicy.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.platform.InfiniteAnimationPolicy> {
   }
 
-  public final class InfiniteAnimationPolicyKt {
-  }
-
   public final class InspectableModifier extends androidx.compose.ui.platform.InspectorValueInfo implements androidx.compose.ui.Modifier.Element {
     ctor public InspectableModifier(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo);
     method public androidx.compose.ui.platform.InspectableModifier.End getEnd();
@@ -2863,12 +2738,6 @@
     property public Object? valueOverride;
   }
 
-  public final class InvertMatrixKt {
-  }
-
-  public final class JvmActuals_jvmKt {
-  }
-
   @androidx.compose.ui.ExperimentalComposeUiApi public final class LocalSoftwareKeyboardController {
     method @androidx.compose.runtime.Composable public androidx.compose.ui.platform.SoftwareKeyboardController? getCurrent();
     method public infix androidx.compose.runtime.ProvidedValue<androidx.compose.ui.platform.SoftwareKeyboardController> provides(androidx.compose.ui.platform.SoftwareKeyboardController softwareKeyboardController);
@@ -2880,9 +2749,6 @@
     method @androidx.compose.runtime.Composable public static androidx.compose.ui.input.nestedscroll.NestedScrollConnection rememberNestedScrollInteropConnection(optional android.view.View hostView);
   }
 
-  public final class ShapeContainingUtilKt {
-  }
-
   @androidx.compose.runtime.Stable @androidx.compose.ui.ExperimentalComposeUiApi public interface SoftwareKeyboardController {
     method public void hide();
     method @Deprecated public default void hideSoftwareKeyboard();
@@ -2960,9 +2826,6 @@
     field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed INSTANCE;
   }
 
-  public final class ViewCompositionStrategy_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ViewConfiguration {
     method public long getDoubleTapMinTimeMillis();
     method public long getDoubleTapTimeoutMillis();
@@ -3007,9 +2870,6 @@
     property @androidx.compose.ui.ExperimentalComposeUiApi public default int keyboardModifiers;
   }
 
-  public final class WindowInfoKt {
-  }
-
   @androidx.compose.ui.InternalComposeUiApi public fun interface WindowRecomposerFactory {
     method public androidx.compose.runtime.Recomposer createRecomposer(android.view.View windowRootView);
     field public static final androidx.compose.ui.platform.WindowRecomposerFactory.Companion Companion;
@@ -3033,16 +2893,6 @@
     method public static void setCompositionContext(android.view.View, androidx.compose.runtime.CompositionContext?);
   }
 
-  public final class Wrapper_androidKt {
-  }
-
-}
-
-package androidx.compose.ui.platform.accessibility {
-
-  public final class CollectionInfoKt {
-  }
-
 }
 
 package androidx.compose.ui.res {
@@ -3071,9 +2921,6 @@
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static int integerResource(@IntegerRes int id);
   }
 
-  public final class Resources_androidKt {
-  }
-
   public final class StringResources_androidKt {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String pluralStringResource(@PluralsRes int id, int count);
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String pluralStringResource(@PluralsRes int id, int count, java.lang.Object... formatArgs);
@@ -3294,9 +3141,6 @@
     property public final androidx.compose.ui.geometry.Rect touchBoundsInRoot;
   }
 
-  public final class SemanticsNodeKt {
-  }
-
   public final class SemanticsOwner {
     method public androidx.compose.ui.semantics.SemanticsNode getRootSemanticsNode();
     method public androidx.compose.ui.semantics.SemanticsNode getUnmergedRootSemanticsNode();
@@ -3463,9 +3307,6 @@
     method public operator <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
   }
 
-  public final class SemanticsSortKt {
-  }
-
 }
 
 package androidx.compose.ui.state {
@@ -3492,27 +3333,8 @@
 
 }
 
-package androidx.compose.ui.text.input {
-
-  public final class CursorAnchorInfoBuilderKt {
-  }
-
-  public final class InputState_androidKt {
-  }
-
-  public final class RecordingInputConnection_androidKt {
-  }
-
-  public final class TextInputServiceAndroid_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.viewinterop {
 
-  public final class AndroidViewHolder_androidKt {
-  }
-
   public final class AndroidView_androidKt {
     method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static <T extends android.view.View> void AndroidView(kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
     method public static kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> getNoOpUpdate();
@@ -3584,8 +3406,5 @@
     enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOn;
   }
 
-  public final class SecureFlagPolicy_androidKt {
-  }
-
 }
 
diff --git a/compose/ui/ui/api/public_plus_experimental_current.txt b/compose/ui/ui/api/public_plus_experimental_current.txt
index 01283ce..a619ca2 100644
--- a/compose/ui/ui/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui/api/public_plus_experimental_current.txt
@@ -21,9 +21,6 @@
     field public static final androidx.compose.ui.AbsoluteAlignment INSTANCE;
   }
 
-  public final class ActualKt {
-  }
-
   @androidx.compose.runtime.Stable public fun interface Alignment {
     method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
     field public static final androidx.compose.ui.Alignment.Companion Companion;
@@ -175,9 +172,6 @@
   public static final class MotionDurationScale.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.MotionDurationScale> {
   }
 
-  public final class TempListUtilsKt {
-  }
-
   @androidx.compose.runtime.ComposableTargetMarker(description="UI Composable") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface UiComposable {
   }
 
@@ -189,12 +183,6 @@
 
 package androidx.compose.ui.autofill {
 
-  public final class AndroidAutofillType_androidKt {
-  }
-
-  public final class AndroidAutofill_androidKt {
-  }
-
   @androidx.compose.ui.ExperimentalComposeUiApi public interface Autofill {
     method public void cancelAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
     method public void requestAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
@@ -355,9 +343,6 @@
 
 package androidx.compose.ui.focus {
 
-  public final class BeyondBoundsLayoutKt {
-  }
-
   public final class FocusChangedModifierKt {
     method public static androidx.compose.ui.Modifier onFocusChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusChanged);
   }
@@ -401,9 +386,6 @@
     method public void onFocusEvent(androidx.compose.ui.focus.FocusState focusState);
   }
 
-  public final class FocusEventModifierNodeKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface FocusManager {
     method public void clearFocus(optional boolean force);
     method public boolean moveFocus(int focusDirection);
@@ -532,9 +514,6 @@
     field public static final androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory INSTANCE;
   }
 
-  public final class FocusRequesterKt {
-  }
-
   @Deprecated @kotlin.jvm.JvmDefaultWithCompatibility public interface FocusRequesterModifier extends androidx.compose.ui.Modifier.Element {
     method @Deprecated public androidx.compose.ui.focus.FocusRequester getFocusRequester();
     property public abstract androidx.compose.ui.focus.FocusRequester focusRequester;
@@ -569,18 +548,6 @@
     property public final androidx.compose.ui.focus.FocusState focusState;
   }
 
-  public final class FocusTransactionsKt {
-  }
-
-  public final class FocusTraversalKt {
-  }
-
-  public final class OneDimensionalFocusSearchKt {
-  }
-
-  public final class TwoDimensionalFocusSearchKt {
-  }
-
 }
 
 package androidx.compose.ui.graphics {
@@ -932,13 +899,6 @@
 
 }
 
-package androidx.compose.ui.graphics.vector.compat {
-
-  public final class XmlVectorParser_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.hapticfeedback {
 
   public interface HapticFeedback {
@@ -1636,9 +1596,6 @@
     method public static androidx.compose.ui.Modifier nestedScroll(androidx.compose.ui.Modifier, androidx.compose.ui.input.nestedscroll.NestedScrollConnection connection, optional androidx.compose.ui.input.nestedscroll.NestedScrollDispatcher? dispatcher);
   }
 
-  public final class NestedScrollModifierLocalKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class NestedScrollSource {
     field public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource.Companion Companion;
   }
@@ -1850,9 +1807,6 @@
     property public final long uptimeMillis;
   }
 
-  public final class PointerInputEventProcessorKt {
-  }
-
   public abstract class PointerInputFilter {
     ctor public PointerInputFilter();
     method public boolean getInterceptOutOfBoundsChildEvents();
@@ -1883,17 +1837,11 @@
     property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
   }
 
-  public final class PointerInputTestUtilKt {
-  }
-
   public final class PointerInteropFilter_androidKt {
     method @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.ui.Modifier motionEventSpy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super android.view.MotionEvent,kotlin.Unit> watcher);
     method @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.ui.Modifier pointerInteropFilter(androidx.compose.ui.Modifier, optional androidx.compose.ui.input.pointer.RequestDisallowInterceptTouchEvent? requestDisallowInterceptTouchEvent, kotlin.jvm.functions.Function1<? super android.view.MotionEvent,java.lang.Boolean> onTouchEvent);
   }
 
-  public final class PointerInteropUtils_androidKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class PointerKeyboardModifiers {
     ctor public PointerKeyboardModifiers(int packedValue);
   }
@@ -1976,13 +1924,6 @@
 
 }
 
-package androidx.compose.ui.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.layout {
 
   @androidx.compose.runtime.Immutable public abstract sealed class AlignmentLine {
@@ -2055,9 +1996,6 @@
     property public final androidx.compose.ui.layout.FixedScale None;
   }
 
-  public final class ContentScaleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class FixedScale implements androidx.compose.ui.layout.ContentScale {
     ctor public FixedScale(float value);
     method public float component1();
@@ -2179,9 +2117,6 @@
     method public long localLookaheadPositionOf(androidx.compose.ui.layout.LookaheadLayoutCoordinates sourceCoordinates, optional long relativeToSource);
   }
 
-  public final class LookaheadLayoutCoordinatesKt {
-  }
-
   public final class LookaheadLayoutKt {
     method @androidx.compose.runtime.Composable @androidx.compose.ui.ExperimentalComposeUiApi @androidx.compose.ui.UiComposable public static void LookaheadLayout(kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LookaheadLayoutScope,kotlin.Unit> content, optional androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
   }
@@ -2245,9 +2180,6 @@
     method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable>> measurables, int height);
   }
 
-  public final class MultiContentMeasurePolicyKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface OnGloballyPositionedModifier extends androidx.compose.ui.Modifier.Element {
     method public void onGloballyPositioned(androidx.compose.ui.layout.LayoutCoordinates coordinates);
   }
@@ -2328,9 +2260,6 @@
     property protected abstract int parentWidth;
   }
 
-  public final class PlaceableKt {
-  }
-
   @Deprecated @androidx.compose.ui.ExperimentalComposeUiApi @kotlin.jvm.JvmDefaultWithCompatibility public interface RelocationModifier extends androidx.compose.ui.Modifier.Element {
     method @Deprecated public androidx.compose.ui.geometry.Rect computeDestination(androidx.compose.ui.geometry.Rect source, androidx.compose.ui.layout.LayoutCoordinates layoutCoordinates);
     method @Deprecated public suspend Object? performRelocation(androidx.compose.ui.geometry.Rect source, androidx.compose.ui.geometry.Rect destination, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -2492,9 +2421,6 @@
 
 package androidx.compose.ui.node {
 
-  public final class BackwardsCompatNodeKt {
-  }
-
   @androidx.compose.ui.ExperimentalComposeUiApi public interface DelegatableNode {
     method public androidx.compose.ui.Modifier.Node getNode();
     property public abstract androidx.compose.ui.Modifier.Node node;
@@ -2522,9 +2448,6 @@
     method public void onGloballyPositioned(androidx.compose.ui.layout.LayoutCoordinates coordinates);
   }
 
-  public final class HitTestResultKt {
-  }
-
   @androidx.compose.ui.ExperimentalComposeUiApi public interface IntermediateLayoutModifierNode extends androidx.compose.ui.node.LayoutModifierNode {
     method public long getTargetSize();
     method public void setTargetSize(long);
@@ -2549,27 +2472,12 @@
     method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
   }
 
-  public final class LayoutModifierNodeCoordinatorKt {
-  }
-
   public final class LayoutModifierNodeKt {
     method @androidx.compose.ui.ExperimentalComposeUiApi public static void invalidateLayer(androidx.compose.ui.node.LayoutModifierNode);
     method @androidx.compose.ui.ExperimentalComposeUiApi public static void invalidateLayout(androidx.compose.ui.node.LayoutModifierNode);
     method @androidx.compose.ui.ExperimentalComposeUiApi public static void invalidateMeasurements(androidx.compose.ui.node.LayoutModifierNode);
   }
 
-  public final class LayoutNodeDrawScopeKt {
-  }
-
-  public final class LayoutNodeKt {
-  }
-
-  public final class LayoutNodeLayoutDelegateKt {
-  }
-
-  public final class MeasureScopeWithLayoutNodeKt {
-  }
-
   @androidx.compose.ui.ExperimentalComposeUiApi public abstract class ModifierNodeElement<N extends androidx.compose.ui.Modifier.Node> extends androidx.compose.ui.platform.InspectorValueInfo implements androidx.compose.ui.Modifier.Element {
     ctor public ModifierNodeElement(optional Object? params, optional boolean autoInvalidate, kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo);
     method public abstract N create();
@@ -2581,18 +2489,6 @@
     method @androidx.compose.ui.ExperimentalComposeUiApi public static inline <reified T extends androidx.compose.ui.Modifier.Node> androidx.compose.ui.Modifier modifierElementOf(kotlin.jvm.functions.Function0<? extends T> create, kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,? extends kotlin.Unit> definitions);
   }
 
-  public final class MyersDiffKt {
-  }
-
-  public final class NodeChainKt {
-  }
-
-  public final class NodeCoordinatorKt {
-  }
-
-  public final class NodeKindKt {
-  }
-
   @androidx.compose.ui.ExperimentalComposeUiApi public interface ObserverNode extends androidx.compose.ui.node.DelegatableNode {
     method public void onObservedReadsChanged();
   }
@@ -2616,9 +2512,6 @@
     method public default boolean sharePointerInputWithSiblings();
   }
 
-  public final class PointerInputModifierNodeKt {
-  }
-
   public final class Ref<T> {
     ctor public Ref();
     method public T? getValue();
@@ -2678,12 +2571,6 @@
     method public long calculateRecommendedTimeoutMillis(long originalTimeoutMillis, optional boolean containsIcons, optional boolean containsText, optional boolean containsControls);
   }
 
-  public final class AndroidClipboardManager_androidKt {
-  }
-
-  public final class AndroidComposeViewAccessibilityDelegateCompat_androidKt {
-  }
-
   public final class AndroidComposeView_androidKt {
   }
 
@@ -2716,9 +2603,6 @@
     property public final kotlin.coroutines.CoroutineContext Main;
   }
 
-  public final class AndroidUiDispatcher_androidKt {
-  }
-
   public final class AndroidUiFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
     method public android.view.Choreographer getChoreographer();
@@ -2791,12 +2675,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> LocalWindowInfo;
   }
 
-  public final class DebugUtilsKt {
-  }
-
-  public final class DisposableSaveableStateRegistry_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface InfiniteAnimationPolicy extends kotlin.coroutines.CoroutineContext.Element {
     method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
     method public suspend <R> Object? onInfiniteOperation(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
@@ -2807,9 +2685,6 @@
   public static final class InfiniteAnimationPolicy.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.platform.InfiniteAnimationPolicy> {
   }
 
-  public final class InfiniteAnimationPolicyKt {
-  }
-
   public final class InspectableModifier extends androidx.compose.ui.platform.InspectorValueInfo implements androidx.compose.ui.Modifier.Element {
     ctor public InspectableModifier(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo);
     method public androidx.compose.ui.platform.InspectableModifier.End getEnd();
@@ -2863,12 +2738,6 @@
     property public Object? valueOverride;
   }
 
-  public final class InvertMatrixKt {
-  }
-
-  public final class JvmActuals_jvmKt {
-  }
-
   @androidx.compose.ui.ExperimentalComposeUiApi public final class LocalSoftwareKeyboardController {
     method @androidx.compose.runtime.Composable public androidx.compose.ui.platform.SoftwareKeyboardController? getCurrent();
     method public infix androidx.compose.runtime.ProvidedValue<androidx.compose.ui.platform.SoftwareKeyboardController> provides(androidx.compose.ui.platform.SoftwareKeyboardController softwareKeyboardController);
@@ -2880,9 +2749,6 @@
     method @androidx.compose.runtime.Composable public static androidx.compose.ui.input.nestedscroll.NestedScrollConnection rememberNestedScrollInteropConnection(optional android.view.View hostView);
   }
 
-  public final class ShapeContainingUtilKt {
-  }
-
   @androidx.compose.runtime.Stable @androidx.compose.ui.ExperimentalComposeUiApi public interface SoftwareKeyboardController {
     method public void hide();
     method @Deprecated public default void hideSoftwareKeyboard();
@@ -2960,9 +2826,6 @@
     field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed INSTANCE;
   }
 
-  public final class ViewCompositionStrategy_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ViewConfiguration {
     method public long getDoubleTapMinTimeMillis();
     method public long getDoubleTapTimeoutMillis();
@@ -3007,9 +2870,6 @@
     property @androidx.compose.ui.ExperimentalComposeUiApi public default int keyboardModifiers;
   }
 
-  public final class WindowInfoKt {
-  }
-
   @androidx.compose.ui.InternalComposeUiApi public fun interface WindowRecomposerFactory {
     method public androidx.compose.runtime.Recomposer createRecomposer(android.view.View windowRootView);
     field public static final androidx.compose.ui.platform.WindowRecomposerFactory.Companion Companion;
@@ -3033,16 +2893,6 @@
     method public static void setCompositionContext(android.view.View, androidx.compose.runtime.CompositionContext?);
   }
 
-  public final class Wrapper_androidKt {
-  }
-
-}
-
-package androidx.compose.ui.platform.accessibility {
-
-  public final class CollectionInfoKt {
-  }
-
 }
 
 package androidx.compose.ui.res {
@@ -3071,9 +2921,6 @@
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static int integerResource(@IntegerRes int id);
   }
 
-  public final class Resources_androidKt {
-  }
-
   public final class StringResources_androidKt {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String pluralStringResource(@PluralsRes int id, int count);
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String pluralStringResource(@PluralsRes int id, int count, java.lang.Object... formatArgs);
@@ -3294,9 +3141,6 @@
     property public final androidx.compose.ui.geometry.Rect touchBoundsInRoot;
   }
 
-  public final class SemanticsNodeKt {
-  }
-
   public final class SemanticsOwner {
     method public androidx.compose.ui.semantics.SemanticsNode getRootSemanticsNode();
     method public androidx.compose.ui.semantics.SemanticsNode getUnmergedRootSemanticsNode();
@@ -3463,9 +3307,6 @@
     method public operator <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
   }
 
-  public final class SemanticsSortKt {
-  }
-
 }
 
 package androidx.compose.ui.state {
@@ -3492,27 +3333,8 @@
 
 }
 
-package androidx.compose.ui.text.input {
-
-  public final class CursorAnchorInfoBuilderKt {
-  }
-
-  public final class InputState_androidKt {
-  }
-
-  public final class RecordingInputConnection_androidKt {
-  }
-
-  public final class TextInputServiceAndroid_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.viewinterop {
 
-  public final class AndroidViewHolder_androidKt {
-  }
-
   public final class AndroidView_androidKt {
     method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static <T extends android.view.View> void AndroidView(kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
     method public static kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> getNoOpUpdate();
@@ -3584,8 +3406,5 @@
     enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOn;
   }
 
-  public final class SecureFlagPolicy_androidKt {
-  }
-
 }
 
diff --git a/compose/ui/ui/api/restricted_1.4.0-beta01.txt b/compose/ui/ui/api/restricted_1.4.0-beta01.txt
index 6165576..3c4f4e5 100644
--- a/compose/ui/ui/api/restricted_1.4.0-beta01.txt
+++ b/compose/ui/ui/api/restricted_1.4.0-beta01.txt
@@ -21,9 +21,6 @@
     field public static final androidx.compose.ui.AbsoluteAlignment INSTANCE;
   }
 
-  public final class ActualKt {
-  }
-
   @androidx.compose.runtime.Stable public fun interface Alignment {
     method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
     field public static final androidx.compose.ui.Alignment.Companion Companion;
@@ -153,9 +150,6 @@
   public static final class MotionDurationScale.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.MotionDurationScale> {
   }
 
-  public final class TempListUtilsKt {
-  }
-
   @androidx.compose.runtime.ComposableTargetMarker(description="UI Composable") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface UiComposable {
   }
 
@@ -165,16 +159,6 @@
 
 }
 
-package androidx.compose.ui.autofill {
-
-  public final class AndroidAutofillType_androidKt {
-  }
-
-  public final class AndroidAutofill_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.draw {
 
   public final class AlphaKt {
@@ -266,9 +250,6 @@
 
 package androidx.compose.ui.focus {
 
-  public final class BeyondBoundsLayoutKt {
-  }
-
   public final class FocusChangedModifierKt {
     method public static androidx.compose.ui.Modifier onFocusChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusChanged);
   }
@@ -300,9 +281,6 @@
     method public static androidx.compose.ui.Modifier onFocusEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusEvent);
   }
 
-  public final class FocusEventModifierNodeKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface FocusManager {
     method public void clearFocus(optional boolean force);
     method public boolean moveFocus(int focusDirection);
@@ -398,9 +376,6 @@
     property public final androidx.compose.ui.focus.FocusRequester Default;
   }
 
-  public final class FocusRequesterKt {
-  }
-
   @Deprecated @kotlin.jvm.JvmDefaultWithCompatibility public interface FocusRequesterModifier extends androidx.compose.ui.Modifier.Element {
     method @Deprecated public androidx.compose.ui.focus.FocusRequester getFocusRequester();
     property public abstract androidx.compose.ui.focus.FocusRequester focusRequester;
@@ -422,18 +397,6 @@
     property public abstract boolean isFocused;
   }
 
-  public final class FocusTransactionsKt {
-  }
-
-  public final class FocusTraversalKt {
-  }
-
-  public final class OneDimensionalFocusSearchKt {
-  }
-
-  public final class TwoDimensionalFocusSearchKt {
-  }
-
 }
 
 package androidx.compose.ui.graphics {
@@ -785,13 +748,6 @@
 
 }
 
-package androidx.compose.ui.graphics.vector.compat {
-
-  public final class XmlVectorParser_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.hapticfeedback {
 
   public interface HapticFeedback {
@@ -1483,9 +1439,6 @@
     method public static androidx.compose.ui.Modifier nestedScroll(androidx.compose.ui.Modifier, androidx.compose.ui.input.nestedscroll.NestedScrollConnection connection, optional androidx.compose.ui.input.nestedscroll.NestedScrollDispatcher? dispatcher);
   }
 
-  public final class NestedScrollModifierLocalKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class NestedScrollSource {
     field public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource.Companion Companion;
   }
@@ -1682,9 +1635,6 @@
     property public final long uptimeMillis;
   }
 
-  public final class PointerInputEventProcessorKt {
-  }
-
   public abstract class PointerInputFilter {
     ctor public PointerInputFilter();
     method public boolean getInterceptOutOfBoundsChildEvents();
@@ -1713,15 +1663,9 @@
     property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
   }
 
-  public final class PointerInputTestUtilKt {
-  }
-
   public final class PointerInteropFilter_androidKt {
   }
 
-  public final class PointerInteropUtils_androidKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class PointerKeyboardModifiers {
     ctor public PointerKeyboardModifiers(int packedValue);
   }
@@ -1794,13 +1738,6 @@
 
 }
 
-package androidx.compose.ui.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.layout {
 
   @androidx.compose.runtime.Immutable public abstract sealed class AlignmentLine {
@@ -1873,9 +1810,6 @@
     property public final androidx.compose.ui.layout.FixedScale None;
   }
 
-  public final class ContentScaleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class FixedScale implements androidx.compose.ui.layout.ContentScale {
     ctor public FixedScale(float value);
     method public float component1();
@@ -1995,9 +1929,6 @@
     method public static androidx.compose.ui.Modifier layout(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function3<? super androidx.compose.ui.layout.MeasureScope,? super androidx.compose.ui.layout.Measurable,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measure);
   }
 
-  public final class LookaheadLayoutCoordinatesKt {
-  }
-
   public final class LookaheadLayoutKt {
   }
 
@@ -2137,9 +2068,6 @@
     property protected abstract int parentWidth;
   }
 
-  public final class PlaceableKt {
-  }
-
   public final class RelocationModifierKt {
   }
 
@@ -2272,9 +2200,6 @@
 
 package androidx.compose.ui.node {
 
-  public final class BackwardsCompatNodeKt {
-  }
-
   @kotlin.PublishedApi internal interface ComposeUiNode {
     method public androidx.compose.ui.unit.Density getDensity();
     method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
@@ -2317,51 +2242,18 @@
   public final class DrawModifierNodeKt {
   }
 
-  public final class HitTestResultKt {
-  }
-
-  public final class LayoutModifierNodeCoordinatorKt {
-  }
-
   public final class LayoutModifierNodeKt {
   }
 
-  public final class LayoutNodeDrawScopeKt {
-  }
-
-  public final class LayoutNodeKt {
-  }
-
-  public final class LayoutNodeLayoutDelegateKt {
-  }
-
-  public final class MeasureScopeWithLayoutNodeKt {
-  }
-
   public final class ModifierNodeElementKt {
   }
 
-  public final class MyersDiffKt {
-  }
-
-  public final class NodeChainKt {
-  }
-
-  public final class NodeCoordinatorKt {
-  }
-
-  public final class NodeKindKt {
-  }
-
   public final class ObserverNodeKt {
   }
 
   public final class ParentDataModifierNodeKt {
   }
 
-  public final class PointerInputModifierNodeKt {
-  }
-
   public final class Ref<T> {
     ctor public Ref();
     method public T? getValue();
@@ -2413,12 +2305,6 @@
     method public long calculateRecommendedTimeoutMillis(long originalTimeoutMillis, optional boolean containsIcons, optional boolean containsText, optional boolean containsControls);
   }
 
-  public final class AndroidClipboardManager_androidKt {
-  }
-
-  public final class AndroidComposeViewAccessibilityDelegateCompat_androidKt {
-  }
-
   public final class AndroidComposeView_androidKt {
   }
 
@@ -2451,9 +2337,6 @@
     property public final kotlin.coroutines.CoroutineContext Main;
   }
 
-  public final class AndroidUiDispatcher_androidKt {
-  }
-
   public final class AndroidUiFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
     method public android.view.Choreographer getChoreographer();
@@ -2522,12 +2405,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> LocalWindowInfo;
   }
 
-  public final class DebugUtilsKt {
-  }
-
-  public final class DisposableSaveableStateRegistry_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface InfiniteAnimationPolicy extends kotlin.coroutines.CoroutineContext.Element {
     method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
     method public suspend <R> Object? onInfiniteOperation(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
@@ -2538,9 +2415,6 @@
   public static final class InfiniteAnimationPolicy.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.platform.InfiniteAnimationPolicy> {
   }
 
-  public final class InfiniteAnimationPolicyKt {
-  }
-
   public final class InspectableModifier extends androidx.compose.ui.platform.InspectorValueInfo implements androidx.compose.ui.Modifier.Element {
     ctor public InspectableModifier(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo);
     method public androidx.compose.ui.platform.InspectableModifier.End getEnd();
@@ -2595,19 +2469,10 @@
     property public Object? valueOverride;
   }
 
-  public final class InvertMatrixKt {
-  }
-
-  public final class JvmActuals_jvmKt {
-  }
-
   public final class NestedScrollInteropConnectionKt {
     method @androidx.compose.runtime.Composable public static androidx.compose.ui.input.nestedscroll.NestedScrollConnection rememberNestedScrollInteropConnection(optional android.view.View hostView);
   }
 
-  public final class ShapeContainingUtilKt {
-  }
-
   public final class TestTagKt {
     method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier testTag(androidx.compose.ui.Modifier, String tag);
   }
@@ -2678,9 +2543,6 @@
     field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed INSTANCE;
   }
 
-  public final class ViewCompositionStrategy_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ViewConfiguration {
     method public long getDoubleTapMinTimeMillis();
     method public long getDoubleTapTimeoutMillis();
@@ -2723,25 +2585,12 @@
     property public abstract boolean isWindowFocused;
   }
 
-  public final class WindowInfoKt {
-  }
-
   public final class WindowRecomposer_androidKt {
     method public static androidx.compose.runtime.CompositionContext? findViewTreeCompositionContext(android.view.View);
     method public static androidx.compose.runtime.CompositionContext? getCompositionContext(android.view.View);
     method public static void setCompositionContext(android.view.View, androidx.compose.runtime.CompositionContext?);
   }
 
-  public final class Wrapper_androidKt {
-  }
-
-}
-
-package androidx.compose.ui.platform.accessibility {
-
-  public final class CollectionInfoKt {
-  }
-
 }
 
 package androidx.compose.ui.res {
@@ -2770,9 +2619,6 @@
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static int integerResource(@IntegerRes int id);
   }
 
-  public final class Resources_androidKt {
-  }
-
   public final class StringResources_androidKt {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String pluralStringResource(@PluralsRes int id, int count);
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String pluralStringResource(@PluralsRes int id, int count, java.lang.Object... formatArgs);
@@ -2993,9 +2839,6 @@
     property public final androidx.compose.ui.geometry.Rect touchBoundsInRoot;
   }
 
-  public final class SemanticsNodeKt {
-  }
-
   public final class SemanticsOwner {
     method public androidx.compose.ui.semantics.SemanticsNode getRootSemanticsNode();
     method public androidx.compose.ui.semantics.SemanticsNode getUnmergedRootSemanticsNode();
@@ -3153,9 +2996,6 @@
     method public operator <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
   }
 
-  public final class SemanticsSortKt {
-  }
-
 }
 
 package androidx.compose.ui.state {
@@ -3181,27 +3021,8 @@
 
 }
 
-package androidx.compose.ui.text.input {
-
-  public final class CursorAnchorInfoBuilderKt {
-  }
-
-  public final class InputState_androidKt {
-  }
-
-  public final class RecordingInputConnection_androidKt {
-  }
-
-  public final class TextInputServiceAndroid_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.viewinterop {
 
-  public final class AndroidViewHolder_androidKt {
-  }
-
   public final class AndroidView_androidKt {
     method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static <T extends android.view.View> void AndroidView(kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
     method public static kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> getNoOpUpdate();
@@ -3272,8 +3093,5 @@
     enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOn;
   }
 
-  public final class SecureFlagPolicy_androidKt {
-  }
-
 }
 
diff --git a/compose/ui/ui/api/restricted_current.ignore b/compose/ui/ui/api/restricted_current.ignore
index b9629b2..1754535 100644
--- a/compose/ui/ui/api/restricted_current.ignore
+++ b/compose/ui/ui/api/restricted_current.ignore
@@ -3,5 +3,105 @@
     Attempted to remove @NonNull annotation from method androidx.compose.ui.graphics.GraphicsLayerModifierKt.graphicsLayer(androidx.compose.ui.Modifier,float,float,float,float,float,float,float,float,float,float,long,androidx.compose.ui.graphics.Shape,boolean,androidx.compose.ui.graphics.RenderEffect,long,long)
 
 
+RemovedClass: androidx.compose.ui.ActualKt:
+    Removed class androidx.compose.ui.ActualKt
+RemovedClass: androidx.compose.ui.TempListUtilsKt:
+    Removed class androidx.compose.ui.TempListUtilsKt
+RemovedClass: androidx.compose.ui.focus.BeyondBoundsLayoutKt:
+    Removed class androidx.compose.ui.focus.BeyondBoundsLayoutKt
 RemovedClass: androidx.compose.ui.focus.FocusManagerKt:
     Removed class androidx.compose.ui.focus.FocusManagerKt
+RemovedClass: androidx.compose.ui.focus.FocusRequesterKt:
+    Removed class androidx.compose.ui.focus.FocusRequesterKt
+RemovedClass: androidx.compose.ui.focus.FocusTransactionsKt:
+    Removed class androidx.compose.ui.focus.FocusTransactionsKt
+RemovedClass: androidx.compose.ui.focus.FocusTraversalKt:
+    Removed class androidx.compose.ui.focus.FocusTraversalKt
+RemovedClass: androidx.compose.ui.focus.OneDimensionalFocusSearchKt:
+    Removed class androidx.compose.ui.focus.OneDimensionalFocusSearchKt
+RemovedClass: androidx.compose.ui.focus.TwoDimensionalFocusSearchKt:
+    Removed class androidx.compose.ui.focus.TwoDimensionalFocusSearchKt
+RemovedClass: androidx.compose.ui.input.nestedscroll.NestedScrollModifierLocalKt:
+    Removed class androidx.compose.ui.input.nestedscroll.NestedScrollModifierLocalKt
+RemovedClass: androidx.compose.ui.input.pointer.PointerInputEventProcessorKt:
+    Removed class androidx.compose.ui.input.pointer.PointerInputEventProcessorKt
+RemovedClass: androidx.compose.ui.input.pointer.PointerInputTestUtilKt:
+    Removed class androidx.compose.ui.input.pointer.PointerInputTestUtilKt
+RemovedClass: androidx.compose.ui.input.pointer.PointerInteropUtils_androidKt:
+    Removed class androidx.compose.ui.input.pointer.PointerInteropUtils_androidKt
+RemovedClass: androidx.compose.ui.layout.ContentScaleKt:
+    Removed class androidx.compose.ui.layout.ContentScaleKt
+RemovedClass: androidx.compose.ui.layout.LookaheadLayoutCoordinatesKt:
+    Removed class androidx.compose.ui.layout.LookaheadLayoutCoordinatesKt
+RemovedClass: androidx.compose.ui.layout.PlaceableKt:
+    Removed class androidx.compose.ui.layout.PlaceableKt
+RemovedClass: androidx.compose.ui.node.BackwardsCompatNodeKt:
+    Removed class androidx.compose.ui.node.BackwardsCompatNodeKt
+RemovedClass: androidx.compose.ui.node.HitTestResultKt:
+    Removed class androidx.compose.ui.node.HitTestResultKt
+RemovedClass: androidx.compose.ui.node.LayoutModifierNodeCoordinatorKt:
+    Removed class androidx.compose.ui.node.LayoutModifierNodeCoordinatorKt
+RemovedClass: androidx.compose.ui.node.LayoutNodeDrawScopeKt:
+    Removed class androidx.compose.ui.node.LayoutNodeDrawScopeKt
+RemovedClass: androidx.compose.ui.node.LayoutNodeKt:
+    Removed class androidx.compose.ui.node.LayoutNodeKt
+RemovedClass: androidx.compose.ui.node.LayoutNodeLayoutDelegateKt:
+    Removed class androidx.compose.ui.node.LayoutNodeLayoutDelegateKt
+RemovedClass: androidx.compose.ui.node.MeasureScopeWithLayoutNodeKt:
+    Removed class androidx.compose.ui.node.MeasureScopeWithLayoutNodeKt
+RemovedClass: androidx.compose.ui.node.MyersDiffKt:
+    Removed class androidx.compose.ui.node.MyersDiffKt
+RemovedClass: androidx.compose.ui.node.NodeChainKt:
+    Removed class androidx.compose.ui.node.NodeChainKt
+RemovedClass: androidx.compose.ui.node.NodeCoordinatorKt:
+    Removed class androidx.compose.ui.node.NodeCoordinatorKt
+RemovedClass: androidx.compose.ui.node.NodeKindKt:
+    Removed class androidx.compose.ui.node.NodeKindKt
+RemovedClass: androidx.compose.ui.node.PointerInputModifierNodeKt:
+    Removed class androidx.compose.ui.node.PointerInputModifierNodeKt
+RemovedClass: androidx.compose.ui.platform.AndroidClipboardManager_androidKt:
+    Removed class androidx.compose.ui.platform.AndroidClipboardManager_androidKt
+RemovedClass: androidx.compose.ui.platform.AndroidComposeViewAccessibilityDelegateCompat_androidKt:
+    Removed class androidx.compose.ui.platform.AndroidComposeViewAccessibilityDelegateCompat_androidKt
+RemovedClass: androidx.compose.ui.platform.AndroidUiDispatcher_androidKt:
+    Removed class androidx.compose.ui.platform.AndroidUiDispatcher_androidKt
+RemovedClass: androidx.compose.ui.platform.DebugUtilsKt:
+    Removed class androidx.compose.ui.platform.DebugUtilsKt
+RemovedClass: androidx.compose.ui.platform.DisposableSaveableStateRegistry_androidKt:
+    Removed class androidx.compose.ui.platform.DisposableSaveableStateRegistry_androidKt
+RemovedClass: androidx.compose.ui.platform.InfiniteAnimationPolicyKt:
+    Removed class androidx.compose.ui.platform.InfiniteAnimationPolicyKt
+RemovedClass: androidx.compose.ui.platform.InvertMatrixKt:
+    Removed class androidx.compose.ui.platform.InvertMatrixKt
+RemovedClass: androidx.compose.ui.platform.JvmActuals_jvmKt:
+    Removed class androidx.compose.ui.platform.JvmActuals_jvmKt
+RemovedClass: androidx.compose.ui.platform.ShapeContainingUtilKt:
+    Removed class androidx.compose.ui.platform.ShapeContainingUtilKt
+RemovedClass: androidx.compose.ui.platform.ViewCompositionStrategy_androidKt:
+    Removed class androidx.compose.ui.platform.ViewCompositionStrategy_androidKt
+RemovedClass: androidx.compose.ui.platform.WindowInfoKt:
+    Removed class androidx.compose.ui.platform.WindowInfoKt
+RemovedClass: androidx.compose.ui.platform.Wrapper_androidKt:
+    Removed class androidx.compose.ui.platform.Wrapper_androidKt
+RemovedClass: androidx.compose.ui.res.Resources_androidKt:
+    Removed class androidx.compose.ui.res.Resources_androidKt
+RemovedClass: androidx.compose.ui.semantics.SemanticsNodeKt:
+    Removed class androidx.compose.ui.semantics.SemanticsNodeKt
+RemovedClass: androidx.compose.ui.semantics.SemanticsSortKt:
+    Removed class androidx.compose.ui.semantics.SemanticsSortKt
+RemovedClass: androidx.compose.ui.viewinterop.AndroidViewHolder_androidKt:
+    Removed class androidx.compose.ui.viewinterop.AndroidViewHolder_androidKt
+RemovedClass: androidx.compose.ui.window.SecureFlagPolicy_androidKt:
+    Removed class androidx.compose.ui.window.SecureFlagPolicy_androidKt
+
+
+RemovedPackage: androidx.compose.ui.autofill:
+    Removed package androidx.compose.ui.autofill
+RemovedPackage: androidx.compose.ui.graphics.vector.compat:
+    Removed package androidx.compose.ui.graphics.vector.compat
+RemovedPackage: androidx.compose.ui.internal:
+    Removed package androidx.compose.ui.internal
+RemovedPackage: androidx.compose.ui.platform.accessibility:
+    Removed package androidx.compose.ui.platform.accessibility
+RemovedPackage: androidx.compose.ui.text.input:
+    Removed package androidx.compose.ui.text.input
diff --git a/compose/ui/ui/api/restricted_current.txt b/compose/ui/ui/api/restricted_current.txt
index 6165576..3c4f4e5 100644
--- a/compose/ui/ui/api/restricted_current.txt
+++ b/compose/ui/ui/api/restricted_current.txt
@@ -21,9 +21,6 @@
     field public static final androidx.compose.ui.AbsoluteAlignment INSTANCE;
   }
 
-  public final class ActualKt {
-  }
-
   @androidx.compose.runtime.Stable public fun interface Alignment {
     method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
     field public static final androidx.compose.ui.Alignment.Companion Companion;
@@ -153,9 +150,6 @@
   public static final class MotionDurationScale.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.MotionDurationScale> {
   }
 
-  public final class TempListUtilsKt {
-  }
-
   @androidx.compose.runtime.ComposableTargetMarker(description="UI Composable") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface UiComposable {
   }
 
@@ -165,16 +159,6 @@
 
 }
 
-package androidx.compose.ui.autofill {
-
-  public final class AndroidAutofillType_androidKt {
-  }
-
-  public final class AndroidAutofill_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.draw {
 
   public final class AlphaKt {
@@ -266,9 +250,6 @@
 
 package androidx.compose.ui.focus {
 
-  public final class BeyondBoundsLayoutKt {
-  }
-
   public final class FocusChangedModifierKt {
     method public static androidx.compose.ui.Modifier onFocusChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusChanged);
   }
@@ -300,9 +281,6 @@
     method public static androidx.compose.ui.Modifier onFocusEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusEvent);
   }
 
-  public final class FocusEventModifierNodeKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface FocusManager {
     method public void clearFocus(optional boolean force);
     method public boolean moveFocus(int focusDirection);
@@ -398,9 +376,6 @@
     property public final androidx.compose.ui.focus.FocusRequester Default;
   }
 
-  public final class FocusRequesterKt {
-  }
-
   @Deprecated @kotlin.jvm.JvmDefaultWithCompatibility public interface FocusRequesterModifier extends androidx.compose.ui.Modifier.Element {
     method @Deprecated public androidx.compose.ui.focus.FocusRequester getFocusRequester();
     property public abstract androidx.compose.ui.focus.FocusRequester focusRequester;
@@ -422,18 +397,6 @@
     property public abstract boolean isFocused;
   }
 
-  public final class FocusTransactionsKt {
-  }
-
-  public final class FocusTraversalKt {
-  }
-
-  public final class OneDimensionalFocusSearchKt {
-  }
-
-  public final class TwoDimensionalFocusSearchKt {
-  }
-
 }
 
 package androidx.compose.ui.graphics {
@@ -785,13 +748,6 @@
 
 }
 
-package androidx.compose.ui.graphics.vector.compat {
-
-  public final class XmlVectorParser_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.hapticfeedback {
 
   public interface HapticFeedback {
@@ -1483,9 +1439,6 @@
     method public static androidx.compose.ui.Modifier nestedScroll(androidx.compose.ui.Modifier, androidx.compose.ui.input.nestedscroll.NestedScrollConnection connection, optional androidx.compose.ui.input.nestedscroll.NestedScrollDispatcher? dispatcher);
   }
 
-  public final class NestedScrollModifierLocalKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class NestedScrollSource {
     field public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource.Companion Companion;
   }
@@ -1682,9 +1635,6 @@
     property public final long uptimeMillis;
   }
 
-  public final class PointerInputEventProcessorKt {
-  }
-
   public abstract class PointerInputFilter {
     ctor public PointerInputFilter();
     method public boolean getInterceptOutOfBoundsChildEvents();
@@ -1713,15 +1663,9 @@
     property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
   }
 
-  public final class PointerInputTestUtilKt {
-  }
-
   public final class PointerInteropFilter_androidKt {
   }
 
-  public final class PointerInteropUtils_androidKt {
-  }
-
   @kotlin.jvm.JvmInline public final value class PointerKeyboardModifiers {
     ctor public PointerKeyboardModifiers(int packedValue);
   }
@@ -1794,13 +1738,6 @@
 
 }
 
-package androidx.compose.ui.internal {
-
-  public final class JvmDefaultWithCompatibility_jvmKt {
-  }
-
-}
-
 package androidx.compose.ui.layout {
 
   @androidx.compose.runtime.Immutable public abstract sealed class AlignmentLine {
@@ -1873,9 +1810,6 @@
     property public final androidx.compose.ui.layout.FixedScale None;
   }
 
-  public final class ContentScaleKt {
-  }
-
   @androidx.compose.runtime.Immutable public final class FixedScale implements androidx.compose.ui.layout.ContentScale {
     ctor public FixedScale(float value);
     method public float component1();
@@ -1995,9 +1929,6 @@
     method public static androidx.compose.ui.Modifier layout(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function3<? super androidx.compose.ui.layout.MeasureScope,? super androidx.compose.ui.layout.Measurable,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measure);
   }
 
-  public final class LookaheadLayoutCoordinatesKt {
-  }
-
   public final class LookaheadLayoutKt {
   }
 
@@ -2137,9 +2068,6 @@
     property protected abstract int parentWidth;
   }
 
-  public final class PlaceableKt {
-  }
-
   public final class RelocationModifierKt {
   }
 
@@ -2272,9 +2200,6 @@
 
 package androidx.compose.ui.node {
 
-  public final class BackwardsCompatNodeKt {
-  }
-
   @kotlin.PublishedApi internal interface ComposeUiNode {
     method public androidx.compose.ui.unit.Density getDensity();
     method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
@@ -2317,51 +2242,18 @@
   public final class DrawModifierNodeKt {
   }
 
-  public final class HitTestResultKt {
-  }
-
-  public final class LayoutModifierNodeCoordinatorKt {
-  }
-
   public final class LayoutModifierNodeKt {
   }
 
-  public final class LayoutNodeDrawScopeKt {
-  }
-
-  public final class LayoutNodeKt {
-  }
-
-  public final class LayoutNodeLayoutDelegateKt {
-  }
-
-  public final class MeasureScopeWithLayoutNodeKt {
-  }
-
   public final class ModifierNodeElementKt {
   }
 
-  public final class MyersDiffKt {
-  }
-
-  public final class NodeChainKt {
-  }
-
-  public final class NodeCoordinatorKt {
-  }
-
-  public final class NodeKindKt {
-  }
-
   public final class ObserverNodeKt {
   }
 
   public final class ParentDataModifierNodeKt {
   }
 
-  public final class PointerInputModifierNodeKt {
-  }
-
   public final class Ref<T> {
     ctor public Ref();
     method public T? getValue();
@@ -2413,12 +2305,6 @@
     method public long calculateRecommendedTimeoutMillis(long originalTimeoutMillis, optional boolean containsIcons, optional boolean containsText, optional boolean containsControls);
   }
 
-  public final class AndroidClipboardManager_androidKt {
-  }
-
-  public final class AndroidComposeViewAccessibilityDelegateCompat_androidKt {
-  }
-
   public final class AndroidComposeView_androidKt {
   }
 
@@ -2451,9 +2337,6 @@
     property public final kotlin.coroutines.CoroutineContext Main;
   }
 
-  public final class AndroidUiDispatcher_androidKt {
-  }
-
   public final class AndroidUiFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
     ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
     method public android.view.Choreographer getChoreographer();
@@ -2522,12 +2405,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> LocalWindowInfo;
   }
 
-  public final class DebugUtilsKt {
-  }
-
-  public final class DisposableSaveableStateRegistry_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface InfiniteAnimationPolicy extends kotlin.coroutines.CoroutineContext.Element {
     method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
     method public suspend <R> Object? onInfiniteOperation(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
@@ -2538,9 +2415,6 @@
   public static final class InfiniteAnimationPolicy.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.platform.InfiniteAnimationPolicy> {
   }
 
-  public final class InfiniteAnimationPolicyKt {
-  }
-
   public final class InspectableModifier extends androidx.compose.ui.platform.InspectorValueInfo implements androidx.compose.ui.Modifier.Element {
     ctor public InspectableModifier(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo);
     method public androidx.compose.ui.platform.InspectableModifier.End getEnd();
@@ -2595,19 +2469,10 @@
     property public Object? valueOverride;
   }
 
-  public final class InvertMatrixKt {
-  }
-
-  public final class JvmActuals_jvmKt {
-  }
-
   public final class NestedScrollInteropConnectionKt {
     method @androidx.compose.runtime.Composable public static androidx.compose.ui.input.nestedscroll.NestedScrollConnection rememberNestedScrollInteropConnection(optional android.view.View hostView);
   }
 
-  public final class ShapeContainingUtilKt {
-  }
-
   public final class TestTagKt {
     method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier testTag(androidx.compose.ui.Modifier, String tag);
   }
@@ -2678,9 +2543,6 @@
     field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed INSTANCE;
   }
 
-  public final class ViewCompositionStrategy_androidKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ViewConfiguration {
     method public long getDoubleTapMinTimeMillis();
     method public long getDoubleTapTimeoutMillis();
@@ -2723,25 +2585,12 @@
     property public abstract boolean isWindowFocused;
   }
 
-  public final class WindowInfoKt {
-  }
-
   public final class WindowRecomposer_androidKt {
     method public static androidx.compose.runtime.CompositionContext? findViewTreeCompositionContext(android.view.View);
     method public static androidx.compose.runtime.CompositionContext? getCompositionContext(android.view.View);
     method public static void setCompositionContext(android.view.View, androidx.compose.runtime.CompositionContext?);
   }
 
-  public final class Wrapper_androidKt {
-  }
-
-}
-
-package androidx.compose.ui.platform.accessibility {
-
-  public final class CollectionInfoKt {
-  }
-
 }
 
 package androidx.compose.ui.res {
@@ -2770,9 +2619,6 @@
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static int integerResource(@IntegerRes int id);
   }
 
-  public final class Resources_androidKt {
-  }
-
   public final class StringResources_androidKt {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String pluralStringResource(@PluralsRes int id, int count);
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String pluralStringResource(@PluralsRes int id, int count, java.lang.Object... formatArgs);
@@ -2993,9 +2839,6 @@
     property public final androidx.compose.ui.geometry.Rect touchBoundsInRoot;
   }
 
-  public final class SemanticsNodeKt {
-  }
-
   public final class SemanticsOwner {
     method public androidx.compose.ui.semantics.SemanticsNode getRootSemanticsNode();
     method public androidx.compose.ui.semantics.SemanticsNode getUnmergedRootSemanticsNode();
@@ -3153,9 +2996,6 @@
     method public operator <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
   }
 
-  public final class SemanticsSortKt {
-  }
-
 }
 
 package androidx.compose.ui.state {
@@ -3181,27 +3021,8 @@
 
 }
 
-package androidx.compose.ui.text.input {
-
-  public final class CursorAnchorInfoBuilderKt {
-  }
-
-  public final class InputState_androidKt {
-  }
-
-  public final class RecordingInputConnection_androidKt {
-  }
-
-  public final class TextInputServiceAndroid_androidKt {
-  }
-
-}
-
 package androidx.compose.ui.viewinterop {
 
-  public final class AndroidViewHolder_androidKt {
-  }
-
   public final class AndroidView_androidKt {
     method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static <T extends android.view.View> void AndroidView(kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
     method public static kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> getNoOpUpdate();
@@ -3272,8 +3093,5 @@
     enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOn;
   }
 
-  public final class SecureFlagPolicy_androidKt {
-  }
-
 }
 
diff --git a/constraintlayout/constraintlayout-compose/api/current.txt b/constraintlayout/constraintlayout-compose/api/current.txt
index 9b065fc..305e1fb 100644
--- a/constraintlayout/constraintlayout-compose/api/current.txt
+++ b/constraintlayout/constraintlayout-compose/api/current.txt
@@ -415,9 +415,6 @@
     method public void itemsWithProperties(int count, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super androidx.compose.runtime.State<androidx.constraintlayout.compose.MotionLayoutScope.MotionProperties>,kotlin.Unit> itemContent);
   }
 
-  public final class MotionDragHandlerKt {
-  }
-
   public interface MotionItemsProvider {
     method public int count();
     method public kotlin.jvm.functions.Function0<kotlin.Unit> getContent(int index);
@@ -425,9 +422,6 @@
     method public boolean hasItemsWithProperties();
   }
 
-  public final class MotionKt {
-  }
-
   public enum MotionLayoutDebugFlags {
     method public static androidx.constraintlayout.compose.MotionLayoutDebugFlags valueOf(String name) throws java.lang.IllegalArgumentException;
     method public static androidx.constraintlayout.compose.MotionLayoutDebugFlags[] values();
@@ -541,10 +535,3 @@
 
 }
 
-package androidx.constraintlayout.compose.carousel {
-
-  public final class CarouselSwipeableKt {
-  }
-
-}
-
diff --git a/constraintlayout/constraintlayout-compose/api/public_plus_experimental_current.txt b/constraintlayout/constraintlayout-compose/api/public_plus_experimental_current.txt
index 9a20684..03cccfe 100644
--- a/constraintlayout/constraintlayout-compose/api/public_plus_experimental_current.txt
+++ b/constraintlayout/constraintlayout-compose/api/public_plus_experimental_current.txt
@@ -590,9 +590,6 @@
     method public void itemsWithProperties(int count, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super androidx.compose.runtime.State<androidx.constraintlayout.compose.MotionLayoutScope.MotionProperties>,kotlin.Unit> itemContent);
   }
 
-  public final class MotionDragHandlerKt {
-  }
-
   public interface MotionItemsProvider {
     method public int count();
     method public kotlin.jvm.functions.Function0<kotlin.Unit> getContent(int index);
@@ -600,9 +597,6 @@
     method public boolean hasItemsWithProperties();
   }
 
-  public final class MotionKt {
-  }
-
   public enum MotionLayoutDebugFlags {
     method public static androidx.constraintlayout.compose.MotionLayoutDebugFlags valueOf(String name) throws java.lang.IllegalArgumentException;
     method public static androidx.constraintlayout.compose.MotionLayoutDebugFlags[] values();
@@ -991,10 +985,3 @@
 
 }
 
-package androidx.constraintlayout.compose.carousel {
-
-  public final class CarouselSwipeableKt {
-  }
-
-}
-
diff --git a/constraintlayout/constraintlayout-compose/api/restricted_current.txt b/constraintlayout/constraintlayout-compose/api/restricted_current.txt
index a52b8ea..aad0717 100644
--- a/constraintlayout/constraintlayout-compose/api/restricted_current.txt
+++ b/constraintlayout/constraintlayout-compose/api/restricted_current.txt
@@ -542,9 +542,6 @@
     method public boolean hasItemsWithProperties();
   }
 
-  public final class MotionKt {
-  }
-
   public enum MotionLayoutDebugFlags {
     method public static androidx.constraintlayout.compose.MotionLayoutDebugFlags valueOf(String name) throws java.lang.IllegalArgumentException;
     method public static androidx.constraintlayout.compose.MotionLayoutDebugFlags[] values();
@@ -725,10 +722,3 @@
 
 }
 
-package androidx.constraintlayout.compose.carousel {
-
-  public final class CarouselSwipeableKt {
-  }
-
-}
-
diff --git a/core/uwb/uwb/api/current.txt b/core/uwb/uwb/api/current.txt
index 34d2568..cd5803b 100644
--- a/core/uwb/uwb/api/current.txt
+++ b/core/uwb/uwb/api/current.txt
@@ -157,10 +157,3 @@
 
 }
 
-package androidx.core.uwb.helper {
-
-  public final class UwbHelperKt {
-  }
-
-}
-
diff --git a/core/uwb/uwb/api/public_plus_experimental_current.txt b/core/uwb/uwb/api/public_plus_experimental_current.txt
index 34d2568..cd5803b 100644
--- a/core/uwb/uwb/api/public_plus_experimental_current.txt
+++ b/core/uwb/uwb/api/public_plus_experimental_current.txt
@@ -157,10 +157,3 @@
 
 }
 
-package androidx.core.uwb.helper {
-
-  public final class UwbHelperKt {
-  }
-
-}
-
diff --git a/core/uwb/uwb/api/restricted_current.txt b/core/uwb/uwb/api/restricted_current.txt
index 34d2568..cd5803b 100644
--- a/core/uwb/uwb/api/restricted_current.txt
+++ b/core/uwb/uwb/api/restricted_current.txt
@@ -157,10 +157,3 @@
 
 }
 
-package androidx.core.uwb.helper {
-
-  public final class UwbHelperKt {
-  }
-
-}
-
diff --git a/datastore/datastore/api/current.ignore b/datastore/datastore/api/current.ignore
index 1301f27..7141632 100644
--- a/datastore/datastore/api/current.ignore
+++ b/datastore/datastore/api/current.ignore
@@ -5,3 +5,7 @@
     Attempted to remove parameter name from parameter arg2 in androidx.datastore.migrations.SharedPreferencesMigration.migrate
 ParameterNameChange: androidx.datastore.migrations.SharedPreferencesMigration#shouldMigrate(T, kotlin.coroutines.Continuation<? super java.lang.Boolean>) parameter #1:
     Attempted to remove parameter name from parameter arg2 in androidx.datastore.migrations.SharedPreferencesMigration.shouldMigrate
+
+
+RemovedClass: androidx.datastore.migrations.SharedPreferencesMigrationKt:
+    Removed class androidx.datastore.migrations.SharedPreferencesMigrationKt
diff --git a/datastore/datastore/api/current.txt b/datastore/datastore/api/current.txt
index 029f07b..c4a6933 100644
--- a/datastore/datastore/api/current.txt
+++ b/datastore/datastore/api/current.txt
@@ -25,9 +25,6 @@
     method public suspend Object? shouldMigrate(T? currentData, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
   }
 
-  public final class SharedPreferencesMigrationKt {
-  }
-
   public final class SharedPreferencesView {
     method public operator boolean contains(String key);
     method public java.util.Map<java.lang.String,java.lang.Object> getAll();
diff --git a/datastore/datastore/api/public_plus_experimental_current.txt b/datastore/datastore/api/public_plus_experimental_current.txt
index 029f07b..c4a6933 100644
--- a/datastore/datastore/api/public_plus_experimental_current.txt
+++ b/datastore/datastore/api/public_plus_experimental_current.txt
@@ -25,9 +25,6 @@
     method public suspend Object? shouldMigrate(T? currentData, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
   }
 
-  public final class SharedPreferencesMigrationKt {
-  }
-
   public final class SharedPreferencesView {
     method public operator boolean contains(String key);
     method public java.util.Map<java.lang.String,java.lang.Object> getAll();
diff --git a/datastore/datastore/api/restricted_current.ignore b/datastore/datastore/api/restricted_current.ignore
index 1301f27..7141632 100644
--- a/datastore/datastore/api/restricted_current.ignore
+++ b/datastore/datastore/api/restricted_current.ignore
@@ -5,3 +5,7 @@
     Attempted to remove parameter name from parameter arg2 in androidx.datastore.migrations.SharedPreferencesMigration.migrate
 ParameterNameChange: androidx.datastore.migrations.SharedPreferencesMigration#shouldMigrate(T, kotlin.coroutines.Continuation<? super java.lang.Boolean>) parameter #1:
     Attempted to remove parameter name from parameter arg2 in androidx.datastore.migrations.SharedPreferencesMigration.shouldMigrate
+
+
+RemovedClass: androidx.datastore.migrations.SharedPreferencesMigrationKt:
+    Removed class androidx.datastore.migrations.SharedPreferencesMigrationKt
diff --git a/datastore/datastore/api/restricted_current.txt b/datastore/datastore/api/restricted_current.txt
index 029f07b..c4a6933 100644
--- a/datastore/datastore/api/restricted_current.txt
+++ b/datastore/datastore/api/restricted_current.txt
@@ -25,9 +25,6 @@
     method public suspend Object? shouldMigrate(T? currentData, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
   }
 
-  public final class SharedPreferencesMigrationKt {
-  }
-
   public final class SharedPreferencesView {
     method public operator boolean contains(String key);
     method public java.util.Map<java.lang.String,java.lang.Object> getAll();
diff --git a/glance/glance-appwidget-preview/api/current.txt b/glance/glance-appwidget-preview/api/current.txt
index 873473c..e6f50d0 100644
--- a/glance/glance-appwidget-preview/api/current.txt
+++ b/glance/glance-appwidget-preview/api/current.txt
@@ -1,8 +1 @@
 // Signature format: 4.0
-package androidx.glance.appwidget.preview {
-
-  public final class GlanceAppWidgetViewAdapterKt {
-  }
-
-}
-
diff --git a/glance/glance-appwidget-preview/api/public_plus_experimental_current.txt b/glance/glance-appwidget-preview/api/public_plus_experimental_current.txt
index 873473c..e6f50d0 100644
--- a/glance/glance-appwidget-preview/api/public_plus_experimental_current.txt
+++ b/glance/glance-appwidget-preview/api/public_plus_experimental_current.txt
@@ -1,8 +1 @@
 // Signature format: 4.0
-package androidx.glance.appwidget.preview {
-
-  public final class GlanceAppWidgetViewAdapterKt {
-  }
-
-}
-
diff --git a/glance/glance-appwidget-preview/api/restricted_current.txt b/glance/glance-appwidget-preview/api/restricted_current.txt
index 873473c..e6f50d0 100644
--- a/glance/glance-appwidget-preview/api/restricted_current.txt
+++ b/glance/glance-appwidget-preview/api/restricted_current.txt
@@ -1,8 +1 @@
 // Signature format: 4.0
-package androidx.glance.appwidget.preview {
-
-  public final class GlanceAppWidgetViewAdapterKt {
-  }
-
-}
-
diff --git a/glance/glance-appwidget/api/current.txt b/glance/glance-appwidget/api/current.txt
index c3751e8..0bfd96b 100644
--- a/glance/glance-appwidget/api/current.txt
+++ b/glance/glance-appwidget/api/current.txt
@@ -10,18 +10,6 @@
     method public static androidx.glance.GlanceModifier appWidgetBackground(androidx.glance.GlanceModifier);
   }
 
-  public final class AppWidgetModifiersKt {
-  }
-
-  public final class AppWidgetSessionKt {
-  }
-
-  public final class AppWidgetUtilsKt {
-  }
-
-  public final class ApplyModifiersKt {
-  }
-
   public final class BackgroundKt {
     method public static androidx.glance.GlanceModifier background(androidx.glance.GlanceModifier, long day, long night);
   }
@@ -50,12 +38,6 @@
     method public static androidx.glance.GlanceModifier cornerRadius(androidx.glance.GlanceModifier, @DimenRes int radius);
   }
 
-  public final class CoroutineBroadcastReceiverKt {
-  }
-
-  public final class GeneratedLayoutsKt {
-  }
-
   public abstract class GlanceAppWidget {
     ctor public GlanceAppWidget(optional @LayoutRes int errorUiLayout);
     method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void Content();
@@ -86,9 +68,6 @@
     method public <T extends androidx.glance.appwidget.GlanceAppWidgetReceiver> boolean requestPinGlanceAppWidget(Class<T> receiver, optional androidx.glance.appwidget.GlanceAppWidget? preview, optional Object? previewState, optional android.app.PendingIntent? successCallback);
   }
 
-  public final class GlanceAppWidgetManagerKt {
-  }
-
   public abstract class GlanceAppWidgetReceiver extends android.appwidget.AppWidgetProvider {
     ctor public GlanceAppWidgetReceiver();
     method public abstract androidx.glance.appwidget.GlanceAppWidget getGlanceAppWidget();
@@ -100,30 +79,15 @@
   public static final class GlanceAppWidgetReceiver.Companion {
   }
 
-  public final class GlanceAppWidgetReceiverKt {
-  }
-
-  public final class GlanceRemoteViewsKt {
-  }
-
-  public final class IgnoreResultKt {
-  }
-
   public final class ImageProvidersKt {
     method public static androidx.glance.ImageProvider ImageProvider(android.net.Uri uri);
   }
 
-  public final class LayoutSelectionKt {
-  }
-
   public final class LinearProgressIndicatorKt {
     method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(float progress, optional androidx.glance.GlanceModifier modifier, optional androidx.glance.unit.ColorProvider color, optional androidx.glance.unit.ColorProvider backgroundColor);
     method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(optional androidx.glance.GlanceModifier modifier, optional androidx.glance.unit.ColorProvider color, optional androidx.glance.unit.ColorProvider backgroundColor);
   }
 
-  public final class NormalizeCompositionTreeKt {
-  }
-
   public final class ProgressIndicatorDefaults {
     method public androidx.glance.unit.ColorProvider getBackgroundColorProvider();
     method public androidx.glance.unit.ColorProvider getIndicatorColorProvider();
@@ -143,12 +107,6 @@
     method public static androidx.glance.GlanceModifier selectableGroup(androidx.glance.GlanceModifier);
   }
 
-  public final class RemoteViewsTranslatorKt {
-  }
-
-  public final class SizeBoxKt {
-  }
-
   public sealed interface SizeMode {
   }
 
@@ -175,12 +133,6 @@
     method @androidx.compose.runtime.Composable public static androidx.glance.appwidget.SwitchColors switchColors();
   }
 
-  public final class UtilsKt {
-  }
-
-  public final class WidgetLayoutKt {
-  }
-
 }
 
 package androidx.glance.appwidget.action {
@@ -189,12 +141,6 @@
     method public suspend Object? onAction(android.content.Context context, androidx.glance.GlanceId glanceId, androidx.glance.action.ActionParameters parameters, kotlin.coroutines.Continuation<? super kotlin.Unit>);
   }
 
-  public final class ActionTrampolineKt {
-  }
-
-  public final class ApplyActionKt {
-  }
-
   public final class RunCallbackActionKt {
     method public static <T extends androidx.glance.appwidget.action.ActionCallback> androidx.glance.action.Action actionRunCallback(Class<T> callbackClass, optional androidx.glance.action.ActionParameters parameters);
     method public static inline <reified T extends androidx.glance.appwidget.action.ActionCallback> androidx.glance.action.Action actionRunCallback(optional androidx.glance.action.ActionParameters parameters);
@@ -310,9 +256,6 @@
     method @androidx.compose.runtime.Composable public static void GalleryTemplate(androidx.glance.template.GalleryTemplateData data);
   }
 
-  public final class GlanceAppWidgetTemplatesKt {
-  }
-
   public abstract class GlanceTemplateAppWidget extends androidx.glance.appwidget.GlanceAppWidget {
     ctor public GlanceTemplateAppWidget();
     method @androidx.compose.runtime.Composable public final void Content();
@@ -335,44 +278,3 @@
 
 }
 
-package androidx.glance.appwidget.translators {
-
-  public final class CheckBoxTranslatorKt {
-  }
-
-  public final class CircularProgressIndicatorTranslatorKt {
-  }
-
-  public final class CompoundButtonTranslatorKt {
-  }
-
-  public final class ImageTranslatorKt {
-  }
-
-  public final class LazyListTranslatorKt {
-  }
-
-  public final class LazyVerticalGridTranslatorKt {
-  }
-
-  public final class LinearProgressIndicatorTranslatorKt {
-  }
-
-  public final class RadioButtonTranslatorKt {
-  }
-
-  public final class SwitchTranslatorKt {
-  }
-
-  public final class TextTranslatorKt {
-  }
-
-}
-
-package androidx.glance.appwidget.unit {
-
-  public final class ColorProviderKt {
-  }
-
-}
-
diff --git a/glance/glance-appwidget/api/public_plus_experimental_current.txt b/glance/glance-appwidget/api/public_plus_experimental_current.txt
index 9516a38..be1ed4e 100644
--- a/glance/glance-appwidget/api/public_plus_experimental_current.txt
+++ b/glance/glance-appwidget/api/public_plus_experimental_current.txt
@@ -10,18 +10,6 @@
     method public static androidx.glance.GlanceModifier appWidgetBackground(androidx.glance.GlanceModifier);
   }
 
-  public final class AppWidgetModifiersKt {
-  }
-
-  public final class AppWidgetSessionKt {
-  }
-
-  public final class AppWidgetUtilsKt {
-  }
-
-  public final class ApplyModifiersKt {
-  }
-
   public final class BackgroundKt {
     method public static androidx.glance.GlanceModifier background(androidx.glance.GlanceModifier, long day, long night);
   }
@@ -50,15 +38,9 @@
     method public static androidx.glance.GlanceModifier cornerRadius(androidx.glance.GlanceModifier, @DimenRes int radius);
   }
 
-  public final class CoroutineBroadcastReceiverKt {
-  }
-
   @kotlin.RequiresOptIn(message="This API is experimental and is likely to change in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalGlanceRemoteViewsApi {
   }
 
-  public final class GeneratedLayoutsKt {
-  }
-
   public abstract class GlanceAppWidget {
     ctor public GlanceAppWidget(optional @LayoutRes int errorUiLayout);
     method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void Content();
@@ -89,9 +71,6 @@
     method public <T extends androidx.glance.appwidget.GlanceAppWidgetReceiver> boolean requestPinGlanceAppWidget(Class<T> receiver, optional androidx.glance.appwidget.GlanceAppWidget? preview, optional Object? previewState, optional android.app.PendingIntent? successCallback);
   }
 
-  public final class GlanceAppWidgetManagerKt {
-  }
-
   public abstract class GlanceAppWidgetReceiver extends android.appwidget.AppWidgetProvider {
     ctor public GlanceAppWidgetReceiver();
     method public abstract androidx.glance.appwidget.GlanceAppWidget getGlanceAppWidget();
@@ -103,35 +82,20 @@
   public static final class GlanceAppWidgetReceiver.Companion {
   }
 
-  public final class GlanceAppWidgetReceiverKt {
-  }
-
   @androidx.glance.appwidget.ExperimentalGlanceRemoteViewsApi public final class GlanceRemoteViews {
     ctor public GlanceRemoteViews();
     method public suspend Object? compose(android.content.Context context, long size, optional Object? state, optional android.os.Bundle appWidgetOptions, kotlin.jvm.functions.Function0<kotlin.Unit> content, kotlin.coroutines.Continuation<? super androidx.glance.appwidget.RemoteViewsCompositionResult>);
   }
 
-  public final class GlanceRemoteViewsKt {
-  }
-
-  public final class IgnoreResultKt {
-  }
-
   public final class ImageProvidersKt {
     method public static androidx.glance.ImageProvider ImageProvider(android.net.Uri uri);
   }
 
-  public final class LayoutSelectionKt {
-  }
-
   public final class LinearProgressIndicatorKt {
     method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(float progress, optional androidx.glance.GlanceModifier modifier, optional androidx.glance.unit.ColorProvider color, optional androidx.glance.unit.ColorProvider backgroundColor);
     method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(optional androidx.glance.GlanceModifier modifier, optional androidx.glance.unit.ColorProvider color, optional androidx.glance.unit.ColorProvider backgroundColor);
   }
 
-  public final class NormalizeCompositionTreeKt {
-  }
-
   public final class ProgressIndicatorDefaults {
     method public androidx.glance.unit.ColorProvider getBackgroundColorProvider();
     method public androidx.glance.unit.ColorProvider getIndicatorColorProvider();
@@ -157,12 +121,6 @@
     property public final android.widget.RemoteViews remoteViews;
   }
 
-  public final class RemoteViewsTranslatorKt {
-  }
-
-  public final class SizeBoxKt {
-  }
-
   public sealed interface SizeMode {
   }
 
@@ -189,12 +147,6 @@
     method @androidx.compose.runtime.Composable public static androidx.glance.appwidget.SwitchColors switchColors();
   }
 
-  public final class UtilsKt {
-  }
-
-  public final class WidgetLayoutKt {
-  }
-
 }
 
 package androidx.glance.appwidget.action {
@@ -203,12 +155,6 @@
     method public suspend Object? onAction(android.content.Context context, androidx.glance.GlanceId glanceId, androidx.glance.action.ActionParameters parameters, kotlin.coroutines.Continuation<? super kotlin.Unit>);
   }
 
-  public final class ActionTrampolineKt {
-  }
-
-  public final class ApplyActionKt {
-  }
-
   public final class RunCallbackActionKt {
     method public static <T extends androidx.glance.appwidget.action.ActionCallback> androidx.glance.action.Action actionRunCallback(Class<T> callbackClass, optional androidx.glance.action.ActionParameters parameters);
     method public static inline <reified T extends androidx.glance.appwidget.action.ActionCallback> androidx.glance.action.Action actionRunCallback(optional androidx.glance.action.ActionParameters parameters);
@@ -324,9 +270,6 @@
     method @androidx.compose.runtime.Composable public static void GalleryTemplate(androidx.glance.template.GalleryTemplateData data);
   }
 
-  public final class GlanceAppWidgetTemplatesKt {
-  }
-
   public abstract class GlanceTemplateAppWidget extends androidx.glance.appwidget.GlanceAppWidget {
     ctor public GlanceTemplateAppWidget();
     method @androidx.compose.runtime.Composable public final void Content();
@@ -349,44 +292,3 @@
 
 }
 
-package androidx.glance.appwidget.translators {
-
-  public final class CheckBoxTranslatorKt {
-  }
-
-  public final class CircularProgressIndicatorTranslatorKt {
-  }
-
-  public final class CompoundButtonTranslatorKt {
-  }
-
-  public final class ImageTranslatorKt {
-  }
-
-  public final class LazyListTranslatorKt {
-  }
-
-  public final class LazyVerticalGridTranslatorKt {
-  }
-
-  public final class LinearProgressIndicatorTranslatorKt {
-  }
-
-  public final class RadioButtonTranslatorKt {
-  }
-
-  public final class SwitchTranslatorKt {
-  }
-
-  public final class TextTranslatorKt {
-  }
-
-}
-
-package androidx.glance.appwidget.unit {
-
-  public final class ColorProviderKt {
-  }
-
-}
-
diff --git a/glance/glance-appwidget/api/restricted_current.txt b/glance/glance-appwidget/api/restricted_current.txt
index c3751e8..0bfd96b 100644
--- a/glance/glance-appwidget/api/restricted_current.txt
+++ b/glance/glance-appwidget/api/restricted_current.txt
@@ -10,18 +10,6 @@
     method public static androidx.glance.GlanceModifier appWidgetBackground(androidx.glance.GlanceModifier);
   }
 
-  public final class AppWidgetModifiersKt {
-  }
-
-  public final class AppWidgetSessionKt {
-  }
-
-  public final class AppWidgetUtilsKt {
-  }
-
-  public final class ApplyModifiersKt {
-  }
-
   public final class BackgroundKt {
     method public static androidx.glance.GlanceModifier background(androidx.glance.GlanceModifier, long day, long night);
   }
@@ -50,12 +38,6 @@
     method public static androidx.glance.GlanceModifier cornerRadius(androidx.glance.GlanceModifier, @DimenRes int radius);
   }
 
-  public final class CoroutineBroadcastReceiverKt {
-  }
-
-  public final class GeneratedLayoutsKt {
-  }
-
   public abstract class GlanceAppWidget {
     ctor public GlanceAppWidget(optional @LayoutRes int errorUiLayout);
     method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void Content();
@@ -86,9 +68,6 @@
     method public <T extends androidx.glance.appwidget.GlanceAppWidgetReceiver> boolean requestPinGlanceAppWidget(Class<T> receiver, optional androidx.glance.appwidget.GlanceAppWidget? preview, optional Object? previewState, optional android.app.PendingIntent? successCallback);
   }
 
-  public final class GlanceAppWidgetManagerKt {
-  }
-
   public abstract class GlanceAppWidgetReceiver extends android.appwidget.AppWidgetProvider {
     ctor public GlanceAppWidgetReceiver();
     method public abstract androidx.glance.appwidget.GlanceAppWidget getGlanceAppWidget();
@@ -100,30 +79,15 @@
   public static final class GlanceAppWidgetReceiver.Companion {
   }
 
-  public final class GlanceAppWidgetReceiverKt {
-  }
-
-  public final class GlanceRemoteViewsKt {
-  }
-
-  public final class IgnoreResultKt {
-  }
-
   public final class ImageProvidersKt {
     method public static androidx.glance.ImageProvider ImageProvider(android.net.Uri uri);
   }
 
-  public final class LayoutSelectionKt {
-  }
-
   public final class LinearProgressIndicatorKt {
     method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(float progress, optional androidx.glance.GlanceModifier modifier, optional androidx.glance.unit.ColorProvider color, optional androidx.glance.unit.ColorProvider backgroundColor);
     method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(optional androidx.glance.GlanceModifier modifier, optional androidx.glance.unit.ColorProvider color, optional androidx.glance.unit.ColorProvider backgroundColor);
   }
 
-  public final class NormalizeCompositionTreeKt {
-  }
-
   public final class ProgressIndicatorDefaults {
     method public androidx.glance.unit.ColorProvider getBackgroundColorProvider();
     method public androidx.glance.unit.ColorProvider getIndicatorColorProvider();
@@ -143,12 +107,6 @@
     method public static androidx.glance.GlanceModifier selectableGroup(androidx.glance.GlanceModifier);
   }
 
-  public final class RemoteViewsTranslatorKt {
-  }
-
-  public final class SizeBoxKt {
-  }
-
   public sealed interface SizeMode {
   }
 
@@ -175,12 +133,6 @@
     method @androidx.compose.runtime.Composable public static androidx.glance.appwidget.SwitchColors switchColors();
   }
 
-  public final class UtilsKt {
-  }
-
-  public final class WidgetLayoutKt {
-  }
-
 }
 
 package androidx.glance.appwidget.action {
@@ -189,12 +141,6 @@
     method public suspend Object? onAction(android.content.Context context, androidx.glance.GlanceId glanceId, androidx.glance.action.ActionParameters parameters, kotlin.coroutines.Continuation<? super kotlin.Unit>);
   }
 
-  public final class ActionTrampolineKt {
-  }
-
-  public final class ApplyActionKt {
-  }
-
   public final class RunCallbackActionKt {
     method public static <T extends androidx.glance.appwidget.action.ActionCallback> androidx.glance.action.Action actionRunCallback(Class<T> callbackClass, optional androidx.glance.action.ActionParameters parameters);
     method public static inline <reified T extends androidx.glance.appwidget.action.ActionCallback> androidx.glance.action.Action actionRunCallback(optional androidx.glance.action.ActionParameters parameters);
@@ -310,9 +256,6 @@
     method @androidx.compose.runtime.Composable public static void GalleryTemplate(androidx.glance.template.GalleryTemplateData data);
   }
 
-  public final class GlanceAppWidgetTemplatesKt {
-  }
-
   public abstract class GlanceTemplateAppWidget extends androidx.glance.appwidget.GlanceAppWidget {
     ctor public GlanceTemplateAppWidget();
     method @androidx.compose.runtime.Composable public final void Content();
@@ -335,44 +278,3 @@
 
 }
 
-package androidx.glance.appwidget.translators {
-
-  public final class CheckBoxTranslatorKt {
-  }
-
-  public final class CircularProgressIndicatorTranslatorKt {
-  }
-
-  public final class CompoundButtonTranslatorKt {
-  }
-
-  public final class ImageTranslatorKt {
-  }
-
-  public final class LazyListTranslatorKt {
-  }
-
-  public final class LazyVerticalGridTranslatorKt {
-  }
-
-  public final class LinearProgressIndicatorTranslatorKt {
-  }
-
-  public final class RadioButtonTranslatorKt {
-  }
-
-  public final class SwitchTranslatorKt {
-  }
-
-  public final class TextTranslatorKt {
-  }
-
-}
-
-package androidx.glance.appwidget.unit {
-
-  public final class ColorProviderKt {
-  }
-
-}
-
diff --git a/glance/glance-wear-tiles-preview/api/current.txt b/glance/glance-wear-tiles-preview/api/current.txt
index 5bfa654..e6f50d0 100644
--- a/glance/glance-wear-tiles-preview/api/current.txt
+++ b/glance/glance-wear-tiles-preview/api/current.txt
@@ -1,8 +1 @@
 // Signature format: 4.0
-package androidx.glance.wear.tiles.preview {
-
-  public final class GlanceTileServiceViewAdapterKt {
-  }
-
-}
-
diff --git a/glance/glance-wear-tiles-preview/api/public_plus_experimental_current.txt b/glance/glance-wear-tiles-preview/api/public_plus_experimental_current.txt
index 5bfa654..e6f50d0 100644
--- a/glance/glance-wear-tiles-preview/api/public_plus_experimental_current.txt
+++ b/glance/glance-wear-tiles-preview/api/public_plus_experimental_current.txt
@@ -1,8 +1 @@
 // Signature format: 4.0
-package androidx.glance.wear.tiles.preview {
-
-  public final class GlanceTileServiceViewAdapterKt {
-  }
-
-}
-
diff --git a/glance/glance-wear-tiles-preview/api/restricted_current.txt b/glance/glance-wear-tiles-preview/api/restricted_current.txt
index 5bfa654..e6f50d0 100644
--- a/glance/glance-wear-tiles-preview/api/restricted_current.txt
+++ b/glance/glance-wear-tiles-preview/api/restricted_current.txt
@@ -1,8 +1 @@
 // Signature format: 4.0
-package androidx.glance.wear.tiles.preview {
-
-  public final class GlanceTileServiceViewAdapterKt {
-  }
-
-}
-
diff --git a/glance/glance-wear-tiles/api/current.txt b/glance/glance-wear-tiles/api/current.txt
index d057ed0..ca89aca 100644
--- a/glance/glance-wear-tiles/api/current.txt
+++ b/glance/glance-wear-tiles/api/current.txt
@@ -15,9 +15,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.glance.wear.tiles.TimeInterval> LocalTimeInterval;
   }
 
-  public final class ErrorUiLayoutKt {
-  }
-
   public abstract class GlanceTileService extends androidx.wear.tiles.TileService {
     ctor public GlanceTileService(optional androidx.wear.tiles.LayoutElementBuilders.LayoutElement? errorUiLayout);
     method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void Content();
@@ -35,9 +32,6 @@
   public final class GlanceWearTilesKt {
   }
 
-  public final class NormalizeCompositionTreeKt {
-  }
-
   public final class TimeInterval {
     ctor public TimeInterval(optional java.time.Instant start, optional java.time.Instant end);
     method public java.time.Instant component1();
@@ -62,9 +56,6 @@
     property public final java.util.Set<androidx.glance.wear.tiles.TimeInterval> timeIntervals;
   }
 
-  public final class WearCompositionTranslatorKt {
-  }
-
 }
 
 package androidx.glance.wear.tiles.action {
diff --git a/glance/glance-wear-tiles/api/public_plus_experimental_current.txt b/glance/glance-wear-tiles/api/public_plus_experimental_current.txt
index 7f2a598..ecc93bf 100644
--- a/glance/glance-wear-tiles/api/public_plus_experimental_current.txt
+++ b/glance/glance-wear-tiles/api/public_plus_experimental_current.txt
@@ -15,9 +15,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.glance.wear.tiles.TimeInterval> LocalTimeInterval;
   }
 
-  public final class ErrorUiLayoutKt {
-  }
-
   @kotlin.RequiresOptIn(message="This API is experimental and is likely to change in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalGlanceWearTilesApi {
   }
 
@@ -39,9 +36,6 @@
     method @androidx.glance.wear.tiles.ExperimentalGlanceWearTilesApi public static suspend Object? compose(android.content.Context context, long size, optional Object? state, kotlin.jvm.functions.Function0<kotlin.Unit> content, kotlin.coroutines.Continuation<? super androidx.glance.wear.tiles.WearTilesCompositionResult>);
   }
 
-  public final class NormalizeCompositionTreeKt {
-  }
-
   public final class TimeInterval {
     ctor public TimeInterval(optional java.time.Instant start, optional java.time.Instant end);
     method public java.time.Instant component1();
@@ -66,9 +60,6 @@
     property public final java.util.Set<androidx.glance.wear.tiles.TimeInterval> timeIntervals;
   }
 
-  public final class WearCompositionTranslatorKt {
-  }
-
   @androidx.glance.wear.tiles.ExperimentalGlanceWearTilesApi public final class WearTilesCompositionResult {
     ctor public WearTilesCompositionResult(androidx.wear.tiles.LayoutElementBuilders.LayoutElement layout, androidx.wear.tiles.ResourceBuilders.Resources resources);
     method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement getLayout();
diff --git a/glance/glance-wear-tiles/api/restricted_current.txt b/glance/glance-wear-tiles/api/restricted_current.txt
index d057ed0..ca89aca 100644
--- a/glance/glance-wear-tiles/api/restricted_current.txt
+++ b/glance/glance-wear-tiles/api/restricted_current.txt
@@ -15,9 +15,6 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.glance.wear.tiles.TimeInterval> LocalTimeInterval;
   }
 
-  public final class ErrorUiLayoutKt {
-  }
-
   public abstract class GlanceTileService extends androidx.wear.tiles.TileService {
     ctor public GlanceTileService(optional androidx.wear.tiles.LayoutElementBuilders.LayoutElement? errorUiLayout);
     method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void Content();
@@ -35,9 +32,6 @@
   public final class GlanceWearTilesKt {
   }
 
-  public final class NormalizeCompositionTreeKt {
-  }
-
   public final class TimeInterval {
     ctor public TimeInterval(optional java.time.Instant start, optional java.time.Instant end);
     method public java.time.Instant component1();
@@ -62,9 +56,6 @@
     property public final java.util.Set<androidx.glance.wear.tiles.TimeInterval> timeIntervals;
   }
 
-  public final class WearCompositionTranslatorKt {
-  }
-
 }
 
 package androidx.glance.wear.tiles.action {
diff --git a/glance/glance/api/current.txt b/glance/glance/api/current.txt
index e92fd04..004e9be 100644
--- a/glance/glance/api/current.txt
+++ b/glance/glance/api/current.txt
@@ -423,9 +423,6 @@
 
 package androidx.glance.session {
 
-  public final class SessionKt {
-  }
-
   public final class SessionManagerKt {
   }
 
diff --git a/glance/glance/api/public_plus_experimental_current.txt b/glance/glance/api/public_plus_experimental_current.txt
index e92fd04..004e9be 100644
--- a/glance/glance/api/public_plus_experimental_current.txt
+++ b/glance/glance/api/public_plus_experimental_current.txt
@@ -423,9 +423,6 @@
 
 package androidx.glance.session {
 
-  public final class SessionKt {
-  }
-
   public final class SessionManagerKt {
   }
 
diff --git a/glance/glance/api/restricted_current.txt b/glance/glance/api/restricted_current.txt
index e92fd04..004e9be 100644
--- a/glance/glance/api/restricted_current.txt
+++ b/glance/glance/api/restricted_current.txt
@@ -423,9 +423,6 @@
 
 package androidx.glance.session {
 
-  public final class SessionKt {
-  }
-
   public final class SessionManagerKt {
   }
 
diff --git a/graphics/graphics-shapes/api/current.txt b/graphics/graphics-shapes/api/current.txt
index fa9797d2..f6613a7 100644
--- a/graphics/graphics-shapes/api/current.txt
+++ b/graphics/graphics-shapes/api/current.txt
@@ -99,8 +99,5 @@
     method public static androidx.graphics.shapes.RoundedPolygon Star(int numOuterVertices, @FloatRange(from=0.0, to=1.0, fromInclusive=false, toInclusive=false) float innerRadiusRatio);
   }
 
-  public final class Utils {
-  }
-
 }
 
diff --git a/graphics/graphics-shapes/api/public_plus_experimental_current.txt b/graphics/graphics-shapes/api/public_plus_experimental_current.txt
index fa9797d2..f6613a7 100644
--- a/graphics/graphics-shapes/api/public_plus_experimental_current.txt
+++ b/graphics/graphics-shapes/api/public_plus_experimental_current.txt
@@ -99,8 +99,5 @@
     method public static androidx.graphics.shapes.RoundedPolygon Star(int numOuterVertices, @FloatRange(from=0.0, to=1.0, fromInclusive=false, toInclusive=false) float innerRadiusRatio);
   }
 
-  public final class Utils {
-  }
-
 }
 
diff --git a/graphics/graphics-shapes/api/restricted_current.txt b/graphics/graphics-shapes/api/restricted_current.txt
index fa9797d2..f6613a7 100644
--- a/graphics/graphics-shapes/api/restricted_current.txt
+++ b/graphics/graphics-shapes/api/restricted_current.txt
@@ -99,8 +99,5 @@
     method public static androidx.graphics.shapes.RoundedPolygon Star(int numOuterVertices, @FloatRange(from=0.0, to=1.0, fromInclusive=false, toInclusive=false) float innerRadiusRatio);
   }
 
-  public final class Utils {
-  }
-
 }
 
diff --git a/health/connect/connect-client/api/current.txt b/health/connect/connect-client/api/current.txt
index c26632c..1a20aa3 100644
--- a/health/connect/connect-client/api/current.txt
+++ b/health/connect/connect-client/api/current.txt
@@ -1319,9 +1319,6 @@
     method public androidx.health.connect.client.units.Energy kilojoules(double value);
   }
 
-  public final class EnergyKt {
-  }
-
   public final class Length implements java.lang.Comparable<androidx.health.connect.client.units.Length> {
     method public int compareTo(androidx.health.connect.client.units.Length other);
     method public static androidx.health.connect.client.units.Length feet(double value);
@@ -1350,9 +1347,6 @@
     method public androidx.health.connect.client.units.Length miles(double value);
   }
 
-  public final class LengthKt {
-  }
-
   public final class Mass implements java.lang.Comparable<androidx.health.connect.client.units.Mass> {
     method public int compareTo(androidx.health.connect.client.units.Mass other);
     method public double getGrams();
@@ -1385,9 +1379,6 @@
     method public androidx.health.connect.client.units.Mass pounds(double value);
   }
 
-  public final class MassKt {
-  }
-
   public final class Percentage implements java.lang.Comparable<androidx.health.connect.client.units.Percentage> {
     ctor public Percentage(double value);
     method public int compareTo(androidx.health.connect.client.units.Percentage other);
@@ -1395,9 +1386,6 @@
     property public final double value;
   }
 
-  public final class PercentageKt {
-  }
-
   public final class Power implements java.lang.Comparable<androidx.health.connect.client.units.Power> {
     method public int compareTo(androidx.health.connect.client.units.Power other);
     method public double getKilocaloriesPerDay();
@@ -1414,9 +1402,6 @@
     method public androidx.health.connect.client.units.Power watts(double value);
   }
 
-  public final class PowerKt {
-  }
-
   public final class Pressure implements java.lang.Comparable<androidx.health.connect.client.units.Pressure> {
     method public int compareTo(androidx.health.connect.client.units.Pressure other);
     method public double getMillimetersOfMercury();
@@ -1429,9 +1414,6 @@
     method public androidx.health.connect.client.units.Pressure millimetersOfMercury(double value);
   }
 
-  public final class PressureKt {
-  }
-
   public final class Temperature implements java.lang.Comparable<androidx.health.connect.client.units.Temperature> {
     method public static androidx.health.connect.client.units.Temperature celsius(double value);
     method public int compareTo(androidx.health.connect.client.units.Temperature other);
@@ -1448,9 +1430,6 @@
     method public androidx.health.connect.client.units.Temperature fahrenheit(double value);
   }
 
-  public final class TemperatureKt {
-  }
-
   public final class Velocity implements java.lang.Comparable<androidx.health.connect.client.units.Velocity> {
     method public int compareTo(androidx.health.connect.client.units.Velocity other);
     method public double getKilometersPerHour();
@@ -1471,9 +1450,6 @@
     method public androidx.health.connect.client.units.Velocity milesPerHour(double value);
   }
 
-  public final class VelocityKt {
-  }
-
   public final class Volume implements java.lang.Comparable<androidx.health.connect.client.units.Volume> {
     method public int compareTo(androidx.health.connect.client.units.Volume other);
     method public static androidx.health.connect.client.units.Volume fluidOuncesUs(double value);
@@ -1494,8 +1470,5 @@
     method public androidx.health.connect.client.units.Volume milliliters(double value);
   }
 
-  public final class VolumeKt {
-  }
-
 }
 
diff --git a/health/connect/connect-client/api/public_plus_experimental_current.txt b/health/connect/connect-client/api/public_plus_experimental_current.txt
index c26632c..1a20aa3 100644
--- a/health/connect/connect-client/api/public_plus_experimental_current.txt
+++ b/health/connect/connect-client/api/public_plus_experimental_current.txt
@@ -1319,9 +1319,6 @@
     method public androidx.health.connect.client.units.Energy kilojoules(double value);
   }
 
-  public final class EnergyKt {
-  }
-
   public final class Length implements java.lang.Comparable<androidx.health.connect.client.units.Length> {
     method public int compareTo(androidx.health.connect.client.units.Length other);
     method public static androidx.health.connect.client.units.Length feet(double value);
@@ -1350,9 +1347,6 @@
     method public androidx.health.connect.client.units.Length miles(double value);
   }
 
-  public final class LengthKt {
-  }
-
   public final class Mass implements java.lang.Comparable<androidx.health.connect.client.units.Mass> {
     method public int compareTo(androidx.health.connect.client.units.Mass other);
     method public double getGrams();
@@ -1385,9 +1379,6 @@
     method public androidx.health.connect.client.units.Mass pounds(double value);
   }
 
-  public final class MassKt {
-  }
-
   public final class Percentage implements java.lang.Comparable<androidx.health.connect.client.units.Percentage> {
     ctor public Percentage(double value);
     method public int compareTo(androidx.health.connect.client.units.Percentage other);
@@ -1395,9 +1386,6 @@
     property public final double value;
   }
 
-  public final class PercentageKt {
-  }
-
   public final class Power implements java.lang.Comparable<androidx.health.connect.client.units.Power> {
     method public int compareTo(androidx.health.connect.client.units.Power other);
     method public double getKilocaloriesPerDay();
@@ -1414,9 +1402,6 @@
     method public androidx.health.connect.client.units.Power watts(double value);
   }
 
-  public final class PowerKt {
-  }
-
   public final class Pressure implements java.lang.Comparable<androidx.health.connect.client.units.Pressure> {
     method public int compareTo(androidx.health.connect.client.units.Pressure other);
     method public double getMillimetersOfMercury();
@@ -1429,9 +1414,6 @@
     method public androidx.health.connect.client.units.Pressure millimetersOfMercury(double value);
   }
 
-  public final class PressureKt {
-  }
-
   public final class Temperature implements java.lang.Comparable<androidx.health.connect.client.units.Temperature> {
     method public static androidx.health.connect.client.units.Temperature celsius(double value);
     method public int compareTo(androidx.health.connect.client.units.Temperature other);
@@ -1448,9 +1430,6 @@
     method public androidx.health.connect.client.units.Temperature fahrenheit(double value);
   }
 
-  public final class TemperatureKt {
-  }
-
   public final class Velocity implements java.lang.Comparable<androidx.health.connect.client.units.Velocity> {
     method public int compareTo(androidx.health.connect.client.units.Velocity other);
     method public double getKilometersPerHour();
@@ -1471,9 +1450,6 @@
     method public androidx.health.connect.client.units.Velocity milesPerHour(double value);
   }
 
-  public final class VelocityKt {
-  }
-
   public final class Volume implements java.lang.Comparable<androidx.health.connect.client.units.Volume> {
     method public int compareTo(androidx.health.connect.client.units.Volume other);
     method public static androidx.health.connect.client.units.Volume fluidOuncesUs(double value);
@@ -1494,8 +1470,5 @@
     method public androidx.health.connect.client.units.Volume milliliters(double value);
   }
 
-  public final class VolumeKt {
-  }
-
 }
 
diff --git a/health/connect/connect-client/api/restricted_current.txt b/health/connect/connect-client/api/restricted_current.txt
index 3f0d81f..970b670 100644
--- a/health/connect/connect-client/api/restricted_current.txt
+++ b/health/connect/connect-client/api/restricted_current.txt
@@ -1342,9 +1342,6 @@
     method public androidx.health.connect.client.units.Energy kilojoules(double value);
   }
 
-  public final class EnergyKt {
-  }
-
   public final class Length implements java.lang.Comparable<androidx.health.connect.client.units.Length> {
     method public int compareTo(androidx.health.connect.client.units.Length other);
     method public static androidx.health.connect.client.units.Length feet(double value);
@@ -1373,9 +1370,6 @@
     method public androidx.health.connect.client.units.Length miles(double value);
   }
 
-  public final class LengthKt {
-  }
-
   public final class Mass implements java.lang.Comparable<androidx.health.connect.client.units.Mass> {
     method public int compareTo(androidx.health.connect.client.units.Mass other);
     method public double getGrams();
@@ -1408,9 +1402,6 @@
     method public androidx.health.connect.client.units.Mass pounds(double value);
   }
 
-  public final class MassKt {
-  }
-
   public final class Percentage implements java.lang.Comparable<androidx.health.connect.client.units.Percentage> {
     ctor public Percentage(double value);
     method public int compareTo(androidx.health.connect.client.units.Percentage other);
@@ -1418,9 +1409,6 @@
     property public final double value;
   }
 
-  public final class PercentageKt {
-  }
-
   public final class Power implements java.lang.Comparable<androidx.health.connect.client.units.Power> {
     method public int compareTo(androidx.health.connect.client.units.Power other);
     method public double getKilocaloriesPerDay();
@@ -1437,9 +1425,6 @@
     method public androidx.health.connect.client.units.Power watts(double value);
   }
 
-  public final class PowerKt {
-  }
-
   public final class Pressure implements java.lang.Comparable<androidx.health.connect.client.units.Pressure> {
     method public int compareTo(androidx.health.connect.client.units.Pressure other);
     method public double getMillimetersOfMercury();
@@ -1452,9 +1437,6 @@
     method public androidx.health.connect.client.units.Pressure millimetersOfMercury(double value);
   }
 
-  public final class PressureKt {
-  }
-
   public final class Temperature implements java.lang.Comparable<androidx.health.connect.client.units.Temperature> {
     method public static androidx.health.connect.client.units.Temperature celsius(double value);
     method public int compareTo(androidx.health.connect.client.units.Temperature other);
@@ -1471,9 +1453,6 @@
     method public androidx.health.connect.client.units.Temperature fahrenheit(double value);
   }
 
-  public final class TemperatureKt {
-  }
-
   public final class Velocity implements java.lang.Comparable<androidx.health.connect.client.units.Velocity> {
     method public int compareTo(androidx.health.connect.client.units.Velocity other);
     method public double getKilometersPerHour();
@@ -1494,9 +1473,6 @@
     method public androidx.health.connect.client.units.Velocity milesPerHour(double value);
   }
 
-  public final class VelocityKt {
-  }
-
   public final class Volume implements java.lang.Comparable<androidx.health.connect.client.units.Volume> {
     method public int compareTo(androidx.health.connect.client.units.Volume other);
     method public static androidx.health.connect.client.units.Volume fluidOuncesUs(double value);
@@ -1517,8 +1493,5 @@
     method public androidx.health.connect.client.units.Volume milliliters(double value);
   }
 
-  public final class VolumeKt {
-  }
-
 }
 
diff --git a/navigation/navigation-common/api/current.ignore b/navigation/navigation-common/api/current.ignore
new file mode 100644
index 0000000..a8fe9ea
--- /dev/null
+++ b/navigation/navigation-common/api/current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.navigation.NavArgsLazyKt:
+    Removed class androidx.navigation.NavArgsLazyKt
diff --git a/navigation/navigation-common/api/current.txt b/navigation/navigation-common/api/current.txt
index 067e9f2..de2b551 100644
--- a/navigation/navigation-common/api/current.txt
+++ b/navigation/navigation-common/api/current.txt
@@ -77,9 +77,6 @@
     property public Args value;
   }
 
-  public final class NavArgsLazyKt {
-  }
-
   public final class NavArgument {
     method public Object? getDefaultValue();
     method public androidx.navigation.NavType<java.lang.Object> getType();
diff --git a/navigation/navigation-common/api/public_plus_experimental_current.txt b/navigation/navigation-common/api/public_plus_experimental_current.txt
index 067e9f2..de2b551 100644
--- a/navigation/navigation-common/api/public_plus_experimental_current.txt
+++ b/navigation/navigation-common/api/public_plus_experimental_current.txt
@@ -77,9 +77,6 @@
     property public Args value;
   }
 
-  public final class NavArgsLazyKt {
-  }
-
   public final class NavArgument {
     method public Object? getDefaultValue();
     method public androidx.navigation.NavType<java.lang.Object> getType();
diff --git a/navigation/navigation-common/api/restricted_current.ignore b/navigation/navigation-common/api/restricted_current.ignore
new file mode 100644
index 0000000..a8fe9ea
--- /dev/null
+++ b/navigation/navigation-common/api/restricted_current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.navigation.NavArgsLazyKt:
+    Removed class androidx.navigation.NavArgsLazyKt
diff --git a/navigation/navigation-common/api/restricted_current.txt b/navigation/navigation-common/api/restricted_current.txt
index 067e9f2..de2b551 100644
--- a/navigation/navigation-common/api/restricted_current.txt
+++ b/navigation/navigation-common/api/restricted_current.txt
@@ -77,9 +77,6 @@
     property public Args value;
   }
 
-  public final class NavArgsLazyKt {
-  }
-
   public final class NavArgument {
     method public Object? getDefaultValue();
     method public androidx.navigation.NavType<java.lang.Object> getType();
diff --git a/paging/paging-common/api/current.ignore b/paging/paging-common/api/current.ignore
index 1a78963..aab3a7e 100644
--- a/paging/paging-common/api/current.ignore
+++ b/paging/paging-common/api/current.ignore
@@ -11,5 +11,9 @@
     Removed class androidx.paging.HintHandlerKt
 RemovedClass: androidx.paging.PageFetcherSnapshotKt:
     Removed class androidx.paging.PageFetcherSnapshotKt
+RemovedClass: androidx.paging.RemoteMediatorAccessorKt:
+    Removed class androidx.paging.RemoteMediatorAccessorKt
+RemovedClass: androidx.paging.SeparatorsKt:
+    Removed class androidx.paging.SeparatorsKt
 RemovedClass: androidx.paging.SimpleChannelFlowKt:
     Removed class androidx.paging.SimpleChannelFlowKt
diff --git a/paging/paging-common/api/current.txt b/paging/paging-common/api/current.txt
index a62e0be..56ed7dd 100644
--- a/paging/paging-common/api/current.txt
+++ b/paging/paging-common/api/current.txt
@@ -466,12 +466,6 @@
     field @Deprecated public final int startPosition;
   }
 
-  public final class RemoteMediatorAccessorKt {
-  }
-
-  public final class SeparatorsKt {
-  }
-
   public enum TerminalSeparatorType {
     method public static androidx.paging.TerminalSeparatorType valueOf(String name) throws java.lang.IllegalArgumentException;
     method public static androidx.paging.TerminalSeparatorType[] values();
diff --git a/paging/paging-common/api/public_plus_experimental_current.txt b/paging/paging-common/api/public_plus_experimental_current.txt
index 409ea9f..06ebfb4 100644
--- a/paging/paging-common/api/public_plus_experimental_current.txt
+++ b/paging/paging-common/api/public_plus_experimental_current.txt
@@ -498,12 +498,6 @@
     property public final boolean endOfPaginationReached;
   }
 
-  public final class RemoteMediatorAccessorKt {
-  }
-
-  public final class SeparatorsKt {
-  }
-
   public enum TerminalSeparatorType {
     method public static androidx.paging.TerminalSeparatorType valueOf(String name) throws java.lang.IllegalArgumentException;
     method public static androidx.paging.TerminalSeparatorType[] values();
diff --git a/paging/paging-common/api/restricted_current.ignore b/paging/paging-common/api/restricted_current.ignore
index 1a78963..aab3a7e 100644
--- a/paging/paging-common/api/restricted_current.ignore
+++ b/paging/paging-common/api/restricted_current.ignore
@@ -11,5 +11,9 @@
     Removed class androidx.paging.HintHandlerKt
 RemovedClass: androidx.paging.PageFetcherSnapshotKt:
     Removed class androidx.paging.PageFetcherSnapshotKt
+RemovedClass: androidx.paging.RemoteMediatorAccessorKt:
+    Removed class androidx.paging.RemoteMediatorAccessorKt
+RemovedClass: androidx.paging.SeparatorsKt:
+    Removed class androidx.paging.SeparatorsKt
 RemovedClass: androidx.paging.SimpleChannelFlowKt:
     Removed class androidx.paging.SimpleChannelFlowKt
diff --git a/paging/paging-common/api/restricted_current.txt b/paging/paging-common/api/restricted_current.txt
index a62e0be..56ed7dd 100644
--- a/paging/paging-common/api/restricted_current.txt
+++ b/paging/paging-common/api/restricted_current.txt
@@ -466,12 +466,6 @@
     field @Deprecated public final int startPosition;
   }
 
-  public final class RemoteMediatorAccessorKt {
-  }
-
-  public final class SeparatorsKt {
-  }
-
   public enum TerminalSeparatorType {
     method public static androidx.paging.TerminalSeparatorType valueOf(String name) throws java.lang.IllegalArgumentException;
     method public static androidx.paging.TerminalSeparatorType[] values();
diff --git a/paging/paging-runtime/api/current.ignore b/paging/paging-runtime/api/current.ignore
index 41c88d3..6c9631d 100644
--- a/paging/paging-runtime/api/current.ignore
+++ b/paging/paging-runtime/api/current.ignore
@@ -5,3 +5,7 @@
     Attempted to remove parameter name from parameter arg1 in androidx.paging.LoadStateAdapter.setLoadState
 ParameterNameChange: androidx.paging.PagingDataAdapter#submitData(androidx.paging.PagingData<T>, kotlin.coroutines.Continuation<? super kotlin.Unit>) parameter #1:
     Attempted to remove parameter name from parameter arg2 in androidx.paging.PagingDataAdapter.submitData
+
+
+RemovedClass: androidx.paging.NullPaddedListDiffHelperKt:
+    Removed class androidx.paging.NullPaddedListDiffHelperKt
diff --git a/paging/paging-runtime/api/current.txt b/paging/paging-runtime/api/current.txt
index a53ce96..b67fc35 100644
--- a/paging/paging-runtime/api/current.txt
+++ b/paging/paging-runtime/api/current.txt
@@ -82,9 +82,6 @@
     property public final androidx.paging.LoadState loadState;
   }
 
-  public final class NullPaddedListDiffHelperKt {
-  }
-
   @Deprecated public abstract class PagedListAdapter<T, VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> extends androidx.recyclerview.widget.RecyclerView.Adapter<VH> {
     ctor @Deprecated protected PagedListAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback);
     ctor @Deprecated protected PagedListAdapter(androidx.recyclerview.widget.AsyncDifferConfig<T> config);
diff --git a/paging/paging-runtime/api/public_plus_experimental_current.txt b/paging/paging-runtime/api/public_plus_experimental_current.txt
index a53ce96..b67fc35 100644
--- a/paging/paging-runtime/api/public_plus_experimental_current.txt
+++ b/paging/paging-runtime/api/public_plus_experimental_current.txt
@@ -82,9 +82,6 @@
     property public final androidx.paging.LoadState loadState;
   }
 
-  public final class NullPaddedListDiffHelperKt {
-  }
-
   @Deprecated public abstract class PagedListAdapter<T, VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> extends androidx.recyclerview.widget.RecyclerView.Adapter<VH> {
     ctor @Deprecated protected PagedListAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback);
     ctor @Deprecated protected PagedListAdapter(androidx.recyclerview.widget.AsyncDifferConfig<T> config);
diff --git a/paging/paging-runtime/api/restricted_current.ignore b/paging/paging-runtime/api/restricted_current.ignore
index 41c88d3..6c9631d 100644
--- a/paging/paging-runtime/api/restricted_current.ignore
+++ b/paging/paging-runtime/api/restricted_current.ignore
@@ -5,3 +5,7 @@
     Attempted to remove parameter name from parameter arg1 in androidx.paging.LoadStateAdapter.setLoadState
 ParameterNameChange: androidx.paging.PagingDataAdapter#submitData(androidx.paging.PagingData<T>, kotlin.coroutines.Continuation<? super kotlin.Unit>) parameter #1:
     Attempted to remove parameter name from parameter arg2 in androidx.paging.PagingDataAdapter.submitData
+
+
+RemovedClass: androidx.paging.NullPaddedListDiffHelperKt:
+    Removed class androidx.paging.NullPaddedListDiffHelperKt
diff --git a/paging/paging-runtime/api/restricted_current.txt b/paging/paging-runtime/api/restricted_current.txt
index a53ce96..b67fc35 100644
--- a/paging/paging-runtime/api/restricted_current.txt
+++ b/paging/paging-runtime/api/restricted_current.txt
@@ -82,9 +82,6 @@
     property public final androidx.paging.LoadState loadState;
   }
 
-  public final class NullPaddedListDiffHelperKt {
-  }
-
   @Deprecated public abstract class PagedListAdapter<T, VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> extends androidx.recyclerview.widget.RecyclerView.Adapter<VH> {
     ctor @Deprecated protected PagedListAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback);
     ctor @Deprecated protected PagedListAdapter(androidx.recyclerview.widget.AsyncDifferConfig<T> config);
diff --git a/room/room-runtime/api/current.ignore b/room/room-runtime/api/current.ignore
new file mode 100644
index 0000000..5d12b05
--- /dev/null
+++ b/room/room-runtime/api/current.ignore
@@ -0,0 +1,7 @@
+// Baseline format: 1.0
+RemovedClass: androidx.room.EntityUpsertionAdapterKt:
+    Removed class androidx.room.EntityUpsertionAdapterKt
+
+
+RemovedPackage: androidx.room.util:
+    Removed package androidx.room.util
diff --git a/room/room-runtime/api/current.txt b/room/room-runtime/api/current.txt
index 33f9ae3..ccae897 100644
--- a/room/room-runtime/api/current.txt
+++ b/room/room-runtime/api/current.txt
@@ -24,9 +24,6 @@
     field public final java.util.List<java.lang.Object> typeConverters;
   }
 
-  public final class EntityUpsertionAdapterKt {
-  }
-
   public class InvalidationTracker {
     method @WorkerThread public void addObserver(androidx.room.InvalidationTracker.Observer observer);
     method public void refreshVersionsAsync();
@@ -160,10 +157,3 @@
 
 }
 
-package androidx.room.util {
-
-  public final class TableInfoKt {
-  }
-
-}
-
diff --git a/room/room-runtime/api/public_plus_experimental_current.txt b/room/room-runtime/api/public_plus_experimental_current.txt
index a7b3c40..55492e7 100644
--- a/room/room-runtime/api/public_plus_experimental_current.txt
+++ b/room/room-runtime/api/public_plus_experimental_current.txt
@@ -24,9 +24,6 @@
     field public final java.util.List<java.lang.Object> typeConverters;
   }
 
-  public final class EntityUpsertionAdapterKt {
-  }
-
   @RequiresOptIn @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface ExperimentalRoomApi {
   }
 
@@ -170,10 +167,3 @@
 
 }
 
-package androidx.room.util {
-
-  public final class TableInfoKt {
-  }
-
-}
-
diff --git a/room/room-runtime/api/restricted_current.ignore b/room/room-runtime/api/restricted_current.ignore
index eb7e8ba..cf34024 100644
--- a/room/room-runtime/api/restricted_current.ignore
+++ b/room/room-runtime/api/restricted_current.ignore
@@ -15,3 +15,9 @@
     Attempted to change parameter name from database to db in method androidx.room.RoomOpenHelper.Delegate.onPostMigrate
 ParameterNameChange: androidx.room.RoomOpenHelper.Delegate#onPreMigrate(androidx.sqlite.db.SupportSQLiteDatabase) parameter #0:
     Attempted to change parameter name from database to db in method androidx.room.RoomOpenHelper.Delegate.onPreMigrate
+
+
+RemovedClass: androidx.room.EntityUpsertionAdapterKt:
+    Removed class androidx.room.EntityUpsertionAdapterKt
+RemovedClass: androidx.room.util.TableInfoKt:
+    Removed class androidx.room.util.TableInfoKt
diff --git a/room/room-runtime/api/restricted_current.txt b/room/room-runtime/api/restricted_current.txt
index 3f55e9d..5416940 100644
--- a/room/room-runtime/api/restricted_current.txt
+++ b/room/room-runtime/api/restricted_current.txt
@@ -70,9 +70,6 @@
     method public java.util.List<java.lang.Long> upsertAndReturnIdsList(java.util.Collection<? extends T> entities);
   }
 
-  public final class EntityUpsertionAdapterKt {
-  }
-
   public class InvalidationTracker {
     ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public InvalidationTracker(androidx.room.RoomDatabase database, java.util.Map<java.lang.String,java.lang.String> shadowTablesMap, java.util.Map<java.lang.String,java.util.Set<java.lang.String>> viewTables, java.lang.String... tableNames);
     ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public InvalidationTracker(androidx.room.RoomDatabase database, java.lang.String... tableNames);
@@ -416,9 +413,6 @@
   public static final class TableInfo.Index.Companion {
   }
 
-  public final class TableInfoKt {
-  }
-
   @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX}) public final class UUIDUtil {
     method public static java.util.UUID convertByteToUUID(byte[] bytes);
     method public static byte[] convertUUIDToByte(java.util.UUID uuid);
diff --git a/tv/tv-foundation/api/current.txt b/tv/tv-foundation/api/current.txt
index 9a5eb4c..bffc836 100644
--- a/tv/tv-foundation/api/current.txt
+++ b/tv/tv-foundation/api/current.txt
@@ -25,28 +25,10 @@
     method public static inline <T> void itemsIndexed(androidx.tv.foundation.lazy.grid.TvLazyGridScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemSpanScope,? super java.lang.Integer,? super T,androidx.tv.foundation.lazy.grid.TvGridItemSpan>? span, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
   }
 
-  public final class LazyGridItemPlacementAnimatorKt {
-  }
-
-  public final class LazyGridItemProviderKt {
-  }
-
-  public final class LazyGridKt {
-  }
-
-  public final class LazyGridMeasureKt {
-  }
-
-  public final class LazyGridScrollPositionKt {
-  }
-
   public final class LazyGridSpanKt {
     method public static long TvGridItemSpan(int currentLineSpan);
   }
 
-  public final class LazySemanticsKt {
-  }
-
   @androidx.compose.runtime.Stable public interface TvGridCells {
     method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
   }
@@ -161,21 +143,8 @@
 
 }
 
-package androidx.tv.foundation.lazy.layout {
-
-  public final class LazyAnimateScrollKt {
-  }
-
-  public final class LazyLayoutSemanticsKt {
-  }
-
-}
-
 package androidx.tv.foundation.lazy.list {
 
-  public final class LazyBeyondBoundsModifierKt {
-  }
-
   public final class LazyDslKt {
     method @androidx.compose.runtime.Composable public static void TvLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.tv.foundation.lazy.list.TvLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional boolean userScrollEnabled, optional androidx.tv.foundation.PivotOffsets pivotOffsets, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListScope,kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void TvLazyRow(optional androidx.compose.ui.Modifier modifier, optional androidx.tv.foundation.lazy.list.TvLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, optional boolean userScrollEnabled, optional androidx.tv.foundation.PivotOffsets pivotOffsets, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListScope,kotlin.Unit> content);
@@ -185,34 +154,10 @@
     method public static inline <T> void itemsIndexed(androidx.tv.foundation.lazy.list.TvLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
   }
 
-  public final class LazyListHeadersKt {
-  }
-
-  public final class LazyListItemPlacementAnimatorKt {
-  }
-
-  public final class LazyListItemProviderKt {
-  }
-
-  public final class LazyListKt {
-  }
-
-  public final class LazyListMeasureKt {
-  }
-
-  public final class LazyListPinnableContainerProviderKt {
-  }
-
-  public final class LazyListScrollPositionKt {
-  }
-
   public final class LazyListStateKt {
     method @androidx.compose.runtime.Composable public static androidx.tv.foundation.lazy.list.TvLazyListState rememberTvLazyListState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
   }
 
-  public final class LazySemanticsKt {
-  }
-
   public interface TvLazyListItemInfo {
     method public int getIndex();
     method public Object getKey();
diff --git a/tv/tv-foundation/api/public_plus_experimental_current.txt b/tv/tv-foundation/api/public_plus_experimental_current.txt
index 950c887..480863c 100644
--- a/tv/tv-foundation/api/public_plus_experimental_current.txt
+++ b/tv/tv-foundation/api/public_plus_experimental_current.txt
@@ -29,28 +29,10 @@
     method public static inline <T> void itemsIndexed(androidx.tv.foundation.lazy.grid.TvLazyGridScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemSpanScope,? super java.lang.Integer,? super T,androidx.tv.foundation.lazy.grid.TvGridItemSpan>? span, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
   }
 
-  public final class LazyGridItemPlacementAnimatorKt {
-  }
-
-  public final class LazyGridItemProviderKt {
-  }
-
-  public final class LazyGridKt {
-  }
-
-  public final class LazyGridMeasureKt {
-  }
-
-  public final class LazyGridScrollPositionKt {
-  }
-
   public final class LazyGridSpanKt {
     method public static long TvGridItemSpan(int currentLineSpan);
   }
 
-  public final class LazySemanticsKt {
-  }
-
   @androidx.compose.runtime.Stable public interface TvGridCells {
     method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
   }
@@ -167,21 +149,8 @@
 
 }
 
-package androidx.tv.foundation.lazy.layout {
-
-  public final class LazyAnimateScrollKt {
-  }
-
-  public final class LazyLayoutSemanticsKt {
-  }
-
-}
-
 package androidx.tv.foundation.lazy.list {
 
-  public final class LazyBeyondBoundsModifierKt {
-  }
-
   public final class LazyDslKt {
     method @androidx.compose.runtime.Composable public static void TvLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.tv.foundation.lazy.list.TvLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional boolean userScrollEnabled, optional androidx.tv.foundation.PivotOffsets pivotOffsets, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListScope,kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void TvLazyRow(optional androidx.compose.ui.Modifier modifier, optional androidx.tv.foundation.lazy.list.TvLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, optional boolean userScrollEnabled, optional androidx.tv.foundation.PivotOffsets pivotOffsets, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListScope,kotlin.Unit> content);
@@ -191,34 +160,10 @@
     method public static inline <T> void itemsIndexed(androidx.tv.foundation.lazy.list.TvLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
   }
 
-  public final class LazyListHeadersKt {
-  }
-
-  public final class LazyListItemPlacementAnimatorKt {
-  }
-
-  public final class LazyListItemProviderKt {
-  }
-
-  public final class LazyListKt {
-  }
-
-  public final class LazyListMeasureKt {
-  }
-
-  public final class LazyListPinnableContainerProviderKt {
-  }
-
-  public final class LazyListScrollPositionKt {
-  }
-
   public final class LazyListStateKt {
     method @androidx.compose.runtime.Composable public static androidx.tv.foundation.lazy.list.TvLazyListState rememberTvLazyListState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
   }
 
-  public final class LazySemanticsKt {
-  }
-
   public interface TvLazyListItemInfo {
     method public int getIndex();
     method public Object getKey();
diff --git a/tv/tv-foundation/api/restricted_current.txt b/tv/tv-foundation/api/restricted_current.txt
index 9a5eb4c..bffc836 100644
--- a/tv/tv-foundation/api/restricted_current.txt
+++ b/tv/tv-foundation/api/restricted_current.txt
@@ -25,28 +25,10 @@
     method public static inline <T> void itemsIndexed(androidx.tv.foundation.lazy.grid.TvLazyGridScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemSpanScope,? super java.lang.Integer,? super T,androidx.tv.foundation.lazy.grid.TvGridItemSpan>? span, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
   }
 
-  public final class LazyGridItemPlacementAnimatorKt {
-  }
-
-  public final class LazyGridItemProviderKt {
-  }
-
-  public final class LazyGridKt {
-  }
-
-  public final class LazyGridMeasureKt {
-  }
-
-  public final class LazyGridScrollPositionKt {
-  }
-
   public final class LazyGridSpanKt {
     method public static long TvGridItemSpan(int currentLineSpan);
   }
 
-  public final class LazySemanticsKt {
-  }
-
   @androidx.compose.runtime.Stable public interface TvGridCells {
     method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
   }
@@ -161,21 +143,8 @@
 
 }
 
-package androidx.tv.foundation.lazy.layout {
-
-  public final class LazyAnimateScrollKt {
-  }
-
-  public final class LazyLayoutSemanticsKt {
-  }
-
-}
-
 package androidx.tv.foundation.lazy.list {
 
-  public final class LazyBeyondBoundsModifierKt {
-  }
-
   public final class LazyDslKt {
     method @androidx.compose.runtime.Composable public static void TvLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.tv.foundation.lazy.list.TvLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional boolean userScrollEnabled, optional androidx.tv.foundation.PivotOffsets pivotOffsets, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListScope,kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void TvLazyRow(optional androidx.compose.ui.Modifier modifier, optional androidx.tv.foundation.lazy.list.TvLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, optional boolean userScrollEnabled, optional androidx.tv.foundation.PivotOffsets pivotOffsets, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListScope,kotlin.Unit> content);
@@ -185,34 +154,10 @@
     method public static inline <T> void itemsIndexed(androidx.tv.foundation.lazy.list.TvLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
   }
 
-  public final class LazyListHeadersKt {
-  }
-
-  public final class LazyListItemPlacementAnimatorKt {
-  }
-
-  public final class LazyListItemProviderKt {
-  }
-
-  public final class LazyListKt {
-  }
-
-  public final class LazyListMeasureKt {
-  }
-
-  public final class LazyListPinnableContainerProviderKt {
-  }
-
-  public final class LazyListScrollPositionKt {
-  }
-
   public final class LazyListStateKt {
     method @androidx.compose.runtime.Composable public static androidx.tv.foundation.lazy.list.TvLazyListState rememberTvLazyListState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
   }
 
-  public final class LazySemanticsKt {
-  }
-
   public interface TvLazyListItemInfo {
     method public int getIndex();
     method public Object getKey();
diff --git a/tv/tv-material/api/current.txt b/tv/tv-material/api/current.txt
index 1c7d493..83297a9 100644
--- a/tv/tv-material/api/current.txt
+++ b/tv/tv-material/api/current.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.tv.material3 {
 
-  public final class BringIntoViewIfChildrenAreFocusedKt {
-  }
-
-  public final class CarouselItemKt {
-  }
-
   public final class CarouselKt {
   }
 
@@ -21,9 +15,6 @@
   public final class ImmersiveListKt {
   }
 
-  public final class KeyEventUtilsKt {
-  }
-
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ColorScheme getColorScheme();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Shapes getShapes();
@@ -65,9 +56,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   public final class SurfaceKt {
     method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> getLocalAbsoluteTonalElevation();
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> LocalAbsoluteTonalElevation;
@@ -122,8 +110,5 @@
     property public final androidx.compose.ui.text.TextStyle titleSmall;
   }
 
-  public final class TypographyKt {
-  }
-
 }
 
diff --git a/tv/tv-material/api/public_plus_experimental_current.txt b/tv/tv-material/api/public_plus_experimental_current.txt
index 4afda2a..27d2332 100644
--- a/tv/tv-material/api/public_plus_experimental_current.txt
+++ b/tv/tv-material/api/public_plus_experimental_current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.tv.material3 {
 
-  public final class BringIntoViewIfChildrenAreFocusedKt {
-  }
-
   @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CarouselDefaults {
     method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public void IndicatorRow(int slideCount, int activeSlideIndex, optional androidx.compose.ui.Modifier modifier, optional float spacing, optional kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> indicator);
     method @androidx.compose.runtime.Composable public androidx.compose.animation.ContentTransform getContentTransform();
@@ -24,9 +21,6 @@
     field public static final androidx.tv.material3.CarouselItemDefaults INSTANCE;
   }
 
-  public final class CarouselItemKt {
-  }
-
   public final class CarouselKt {
     method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Carousel(int slideCount, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.CarouselState carouselState, optional long autoScrollDurationMillis, optional androidx.compose.animation.ContentTransform contentTransformForward, optional androidx.compose.animation.ContentTransform contentTransformBackward, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> carouselIndicator, kotlin.jvm.functions.Function2<? super androidx.tv.material3.CarouselScope,? super java.lang.Integer,kotlin.Unit> content);
   }
@@ -142,9 +136,6 @@
     method public androidx.compose.ui.Modifier immersiveListItem(androidx.compose.ui.Modifier, int index);
   }
 
-  public final class KeyEventUtilsKt {
-  }
-
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ColorScheme getColorScheme();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Shapes getShapes();
@@ -192,9 +183,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   public final class SurfaceKt {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Surface(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float tonalElevation, optional androidx.compose.ui.semantics.Role? role, optional float shadowElevation, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> getLocalAbsoluteTonalElevation();
@@ -271,8 +259,5 @@
     property public final androidx.compose.ui.text.TextStyle titleSmall;
   }
 
-  public final class TypographyKt {
-  }
-
 }
 
diff --git a/tv/tv-material/api/restricted_current.txt b/tv/tv-material/api/restricted_current.txt
index 1c7d493..83297a9 100644
--- a/tv/tv-material/api/restricted_current.txt
+++ b/tv/tv-material/api/restricted_current.txt
@@ -1,12 +1,6 @@
 // Signature format: 4.0
 package androidx.tv.material3 {
 
-  public final class BringIntoViewIfChildrenAreFocusedKt {
-  }
-
-  public final class CarouselItemKt {
-  }
-
   public final class CarouselKt {
   }
 
@@ -21,9 +15,6 @@
   public final class ImmersiveListKt {
   }
 
-  public final class KeyEventUtilsKt {
-  }
-
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ColorScheme getColorScheme();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Shapes getShapes();
@@ -65,9 +56,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   public final class SurfaceKt {
     method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> getLocalAbsoluteTonalElevation();
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> LocalAbsoluteTonalElevation;
@@ -122,8 +110,5 @@
     property public final androidx.compose.ui.text.TextStyle titleSmall;
   }
 
-  public final class TypographyKt {
-  }
-
 }
 
diff --git a/wear/compose/compose-foundation/api/current.ignore b/wear/compose/compose-foundation/api/current.ignore
new file mode 100644
index 0000000..714dc1c
--- /dev/null
+++ b/wear/compose/compose-foundation/api/current.ignore
@@ -0,0 +1,5 @@
+// Baseline format: 1.0
+RemovedClass: androidx.wear.compose.foundation.CurvedModifierKt:
+    Removed class androidx.wear.compose.foundation.CurvedModifierKt
+RemovedClass: androidx.wear.compose.foundation.CurvedTextStyleKt:
+    Removed class androidx.wear.compose.foundation.CurvedTextStyleKt
diff --git a/wear/compose/compose-foundation/api/current.txt b/wear/compose/compose-foundation/api/current.txt
index 9f9bb95..2c1e57f 100644
--- a/wear/compose/compose-foundation/api/current.txt
+++ b/wear/compose/compose-foundation/api/current.txt
@@ -114,9 +114,6 @@
   public static final class CurvedModifier.Companion implements androidx.wear.compose.foundation.CurvedModifier {
   }
 
-  public final class CurvedModifierKt {
-  }
-
   public final class CurvedPaddingKt {
     method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(optional float outer, optional float inner, optional float before, optional float after);
     method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(float all);
@@ -170,9 +167,6 @@
     property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
   }
 
-  public final class CurvedTextStyleKt {
-  }
-
   public final class HierarchicalFocusCoordinatorKt {
     method @androidx.compose.runtime.Composable public static void HierarchicalFocusCoordinator(kotlin.jvm.functions.Function0<java.lang.Boolean> requiresFocus, kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void OnFocusChange(kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super java.lang.Boolean,kotlin.Unit> onFocusChanged);
diff --git a/wear/compose/compose-foundation/api/public_plus_experimental_current.txt b/wear/compose/compose-foundation/api/public_plus_experimental_current.txt
index 9f9bb95..2c1e57f 100644
--- a/wear/compose/compose-foundation/api/public_plus_experimental_current.txt
+++ b/wear/compose/compose-foundation/api/public_plus_experimental_current.txt
@@ -114,9 +114,6 @@
   public static final class CurvedModifier.Companion implements androidx.wear.compose.foundation.CurvedModifier {
   }
 
-  public final class CurvedModifierKt {
-  }
-
   public final class CurvedPaddingKt {
     method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(optional float outer, optional float inner, optional float before, optional float after);
     method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(float all);
@@ -170,9 +167,6 @@
     property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
   }
 
-  public final class CurvedTextStyleKt {
-  }
-
   public final class HierarchicalFocusCoordinatorKt {
     method @androidx.compose.runtime.Composable public static void HierarchicalFocusCoordinator(kotlin.jvm.functions.Function0<java.lang.Boolean> requiresFocus, kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void OnFocusChange(kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super java.lang.Boolean,kotlin.Unit> onFocusChanged);
diff --git a/wear/compose/compose-foundation/api/restricted_current.ignore b/wear/compose/compose-foundation/api/restricted_current.ignore
new file mode 100644
index 0000000..714dc1c
--- /dev/null
+++ b/wear/compose/compose-foundation/api/restricted_current.ignore
@@ -0,0 +1,5 @@
+// Baseline format: 1.0
+RemovedClass: androidx.wear.compose.foundation.CurvedModifierKt:
+    Removed class androidx.wear.compose.foundation.CurvedModifierKt
+RemovedClass: androidx.wear.compose.foundation.CurvedTextStyleKt:
+    Removed class androidx.wear.compose.foundation.CurvedTextStyleKt
diff --git a/wear/compose/compose-foundation/api/restricted_current.txt b/wear/compose/compose-foundation/api/restricted_current.txt
index 9f9bb95..2c1e57f 100644
--- a/wear/compose/compose-foundation/api/restricted_current.txt
+++ b/wear/compose/compose-foundation/api/restricted_current.txt
@@ -114,9 +114,6 @@
   public static final class CurvedModifier.Companion implements androidx.wear.compose.foundation.CurvedModifier {
   }
 
-  public final class CurvedModifierKt {
-  }
-
   public final class CurvedPaddingKt {
     method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(optional float outer, optional float inner, optional float before, optional float after);
     method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(float all);
@@ -170,9 +167,6 @@
     property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
   }
 
-  public final class CurvedTextStyleKt {
-  }
-
   public final class HierarchicalFocusCoordinatorKt {
     method @androidx.compose.runtime.Composable public static void HierarchicalFocusCoordinator(kotlin.jvm.functions.Function0<java.lang.Boolean> requiresFocus, kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void OnFocusChange(kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super java.lang.Boolean,kotlin.Unit> onFocusChanged);
diff --git a/wear/compose/compose-material/api/current.ignore b/wear/compose/compose-material/api/current.ignore
index 05e58f9..b61ff34 100644
--- a/wear/compose/compose-material/api/current.ignore
+++ b/wear/compose/compose-material/api/current.ignore
@@ -1,3 +1,21 @@
 // Baseline format: 1.0
 ChangedValue: androidx.wear.compose.material.TimeTextDefaults#TimeFormat12Hours:
     Field androidx.wear.compose.material.TimeTextDefaults.TimeFormat12Hours has changed value from h:mm a to h:mm
+
+
+RemovedClass: androidx.wear.compose.material.AnimationKt:
+    Removed class androidx.wear.compose.material.AnimationKt
+RemovedClass: androidx.wear.compose.material.DefaultTimeSourceKt:
+    Removed class androidx.wear.compose.material.DefaultTimeSourceKt
+RemovedClass: androidx.wear.compose.material.MaterialTextSelectionColorsKt:
+    Removed class androidx.wear.compose.material.MaterialTextSelectionColorsKt
+RemovedClass: androidx.wear.compose.material.RangeDefaultsKt:
+    Removed class androidx.wear.compose.material.RangeDefaultsKt
+RemovedClass: androidx.wear.compose.material.Resources_androidKt:
+    Removed class androidx.wear.compose.material.Resources_androidKt
+RemovedClass: androidx.wear.compose.material.ScalingLazyColumnMeasureKt:
+    Removed class androidx.wear.compose.material.ScalingLazyColumnMeasureKt
+RemovedClass: androidx.wear.compose.material.ShapesKt:
+    Removed class androidx.wear.compose.material.ShapesKt
+RemovedClass: androidx.wear.compose.material.TypographyKt:
+    Removed class androidx.wear.compose.material.TypographyKt
diff --git a/wear/compose/compose-material/api/current.txt b/wear/compose/compose-material/api/current.txt
index a4cfb31..c0a9816 100644
--- a/wear/compose/compose-material/api/current.txt
+++ b/wear/compose/compose-material/api/current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.wear.compose.material {
 
-  public final class AnimationKt {
-  }
-
   @Deprecated @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
     ctor @Deprecated public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
   }
@@ -187,9 +184,6 @@
     method @Deprecated public static void curvedText(androidx.wear.compose.foundation.CurvedScope, String text, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional long background, optional long color, optional long fontSize, optional androidx.wear.compose.foundation.CurvedTextStyle? style, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, optional int overflow);
   }
 
-  public final class DefaultTimeSourceKt {
-  }
-
   public final class HorizontalPageIndicatorKt {
     method @androidx.compose.runtime.Composable public static void HorizontalPageIndicator(androidx.wear.compose.material.PageIndicatorState pageIndicatorState, optional androidx.compose.ui.Modifier modifier, optional int indicatorStyle, optional long selectedColor, optional long unselectedColor, optional float indicatorSize, optional float spacing, optional androidx.compose.ui.graphics.Shape indicatorShape);
   }
@@ -219,9 +213,6 @@
     method @androidx.compose.runtime.Composable public static void ListHeader(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
   }
 
-  public final class MaterialTextSelectionColorsKt {
-  }
-
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Colors getColors();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Shapes getShapes();
@@ -414,12 +405,6 @@
     field public static final androidx.wear.compose.material.RadioButtonDefaults INSTANCE;
   }
 
-  public final class RangeDefaultsKt {
-  }
-
-  public final class Resources_androidKt {
-  }
-
   public final class ScaffoldKt {
     method @androidx.compose.runtime.Composable public static void Scaffold(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? vignette, optional kotlin.jvm.functions.Function0<kotlin.Unit>? positionIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? pageIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? timeText, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
@@ -438,9 +423,6 @@
     method @Deprecated public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
   }
 
-  public final class ScalingLazyColumnMeasureKt {
-  }
-
   @Deprecated @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
     field @Deprecated public static final androidx.wear.compose.material.ScalingLazyListAnchorType.Companion Companion;
   }
@@ -574,9 +556,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   public final class SliderKt {
     method @androidx.compose.runtime.Composable public static void InlineSlider(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, int steps, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional boolean segmented, optional androidx.wear.compose.material.InlineSliderColors colors);
     method @androidx.compose.runtime.Composable public static void InlineSlider(int value, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onValueChange, kotlin.ranges.IntProgression valueProgression, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean segmented, optional androidx.wear.compose.material.InlineSliderColors colors);
@@ -788,9 +767,6 @@
     property public final androidx.compose.ui.text.TextStyle title3;
   }
 
-  public final class TypographyKt {
-  }
-
   public final class VignetteKt {
     method @androidx.compose.runtime.Composable public static void Vignette(int vignettePosition, optional androidx.compose.ui.Modifier modifier);
   }
diff --git a/wear/compose/compose-material/api/public_plus_experimental_current.txt b/wear/compose/compose-material/api/public_plus_experimental_current.txt
index d192ef2..863b8a2 100644
--- a/wear/compose/compose-material/api/public_plus_experimental_current.txt
+++ b/wear/compose/compose-material/api/public_plus_experimental_current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.wear.compose.material {
 
-  public final class AnimationKt {
-  }
-
   @Deprecated @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
     ctor @Deprecated public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
   }
@@ -188,9 +185,6 @@
     method @Deprecated public static void curvedText(androidx.wear.compose.foundation.CurvedScope, String text, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional long background, optional long color, optional long fontSize, optional androidx.wear.compose.foundation.CurvedTextStyle? style, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, optional int overflow);
   }
 
-  public final class DefaultTimeSourceKt {
-  }
-
   @kotlin.RequiresOptIn(message="This Wear Material API is experimental and is likely to change or to be removed in" + " the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalWearMaterialApi {
   }
 
@@ -235,9 +229,6 @@
     method @androidx.compose.runtime.Composable public static void ListHeader(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
   }
 
-  public final class MaterialTextSelectionColorsKt {
-  }
-
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Colors getColors();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Shapes getShapes();
@@ -451,9 +442,6 @@
     field public static final androidx.wear.compose.material.RadioButtonDefaults INSTANCE;
   }
 
-  public final class RangeDefaultsKt {
-  }
-
   @androidx.compose.runtime.Immutable @androidx.wear.compose.material.ExperimentalWearMaterialApi public final class ResistanceConfig {
     ctor public ResistanceConfig(float basis, optional float factorAtMin, optional float factorAtMax);
     method public float computeResistance(float overflow);
@@ -465,9 +453,6 @@
     property public final float factorAtMin;
   }
 
-  public final class Resources_androidKt {
-  }
-
   public final class ScaffoldKt {
     method @androidx.compose.runtime.Composable public static void Scaffold(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? vignette, optional kotlin.jvm.functions.Function0<kotlin.Unit>? positionIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? pageIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? timeText, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
@@ -486,9 +471,6 @@
     method @Deprecated public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
   }
 
-  public final class ScalingLazyColumnMeasureKt {
-  }
-
   @Deprecated @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
     field @Deprecated public static final androidx.wear.compose.material.ScalingLazyListAnchorType.Companion Companion;
   }
@@ -622,9 +604,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   public final class SliderKt {
     method @androidx.compose.runtime.Composable public static void InlineSlider(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, int steps, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional boolean segmented, optional androidx.wear.compose.material.InlineSliderColors colors);
     method @androidx.compose.runtime.Composable public static void InlineSlider(int value, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onValueChange, kotlin.ranges.IntProgression valueProgression, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean segmented, optional androidx.wear.compose.material.InlineSliderColors colors);
@@ -889,9 +868,6 @@
     property public final androidx.compose.ui.text.TextStyle title3;
   }
 
-  public final class TypographyKt {
-  }
-
   public final class VignetteKt {
     method @androidx.compose.runtime.Composable public static void Vignette(int vignettePosition, optional androidx.compose.ui.Modifier modifier);
   }
diff --git a/wear/compose/compose-material/api/restricted_current.ignore b/wear/compose/compose-material/api/restricted_current.ignore
index 05e58f9..b61ff34 100644
--- a/wear/compose/compose-material/api/restricted_current.ignore
+++ b/wear/compose/compose-material/api/restricted_current.ignore
@@ -1,3 +1,21 @@
 // Baseline format: 1.0
 ChangedValue: androidx.wear.compose.material.TimeTextDefaults#TimeFormat12Hours:
     Field androidx.wear.compose.material.TimeTextDefaults.TimeFormat12Hours has changed value from h:mm a to h:mm
+
+
+RemovedClass: androidx.wear.compose.material.AnimationKt:
+    Removed class androidx.wear.compose.material.AnimationKt
+RemovedClass: androidx.wear.compose.material.DefaultTimeSourceKt:
+    Removed class androidx.wear.compose.material.DefaultTimeSourceKt
+RemovedClass: androidx.wear.compose.material.MaterialTextSelectionColorsKt:
+    Removed class androidx.wear.compose.material.MaterialTextSelectionColorsKt
+RemovedClass: androidx.wear.compose.material.RangeDefaultsKt:
+    Removed class androidx.wear.compose.material.RangeDefaultsKt
+RemovedClass: androidx.wear.compose.material.Resources_androidKt:
+    Removed class androidx.wear.compose.material.Resources_androidKt
+RemovedClass: androidx.wear.compose.material.ScalingLazyColumnMeasureKt:
+    Removed class androidx.wear.compose.material.ScalingLazyColumnMeasureKt
+RemovedClass: androidx.wear.compose.material.ShapesKt:
+    Removed class androidx.wear.compose.material.ShapesKt
+RemovedClass: androidx.wear.compose.material.TypographyKt:
+    Removed class androidx.wear.compose.material.TypographyKt
diff --git a/wear/compose/compose-material/api/restricted_current.txt b/wear/compose/compose-material/api/restricted_current.txt
index a4cfb31..c0a9816 100644
--- a/wear/compose/compose-material/api/restricted_current.txt
+++ b/wear/compose/compose-material/api/restricted_current.txt
@@ -1,9 +1,6 @@
 // Signature format: 4.0
 package androidx.wear.compose.material {
 
-  public final class AnimationKt {
-  }
-
   @Deprecated @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
     ctor @Deprecated public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
   }
@@ -187,9 +184,6 @@
     method @Deprecated public static void curvedText(androidx.wear.compose.foundation.CurvedScope, String text, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional long background, optional long color, optional long fontSize, optional androidx.wear.compose.foundation.CurvedTextStyle? style, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, optional int overflow);
   }
 
-  public final class DefaultTimeSourceKt {
-  }
-
   public final class HorizontalPageIndicatorKt {
     method @androidx.compose.runtime.Composable public static void HorizontalPageIndicator(androidx.wear.compose.material.PageIndicatorState pageIndicatorState, optional androidx.compose.ui.Modifier modifier, optional int indicatorStyle, optional long selectedColor, optional long unselectedColor, optional float indicatorSize, optional float spacing, optional androidx.compose.ui.graphics.Shape indicatorShape);
   }
@@ -219,9 +213,6 @@
     method @androidx.compose.runtime.Composable public static void ListHeader(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
   }
 
-  public final class MaterialTextSelectionColorsKt {
-  }
-
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Colors getColors();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Shapes getShapes();
@@ -414,12 +405,6 @@
     field public static final androidx.wear.compose.material.RadioButtonDefaults INSTANCE;
   }
 
-  public final class RangeDefaultsKt {
-  }
-
-  public final class Resources_androidKt {
-  }
-
   public final class ScaffoldKt {
     method @androidx.compose.runtime.Composable public static void Scaffold(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? vignette, optional kotlin.jvm.functions.Function0<kotlin.Unit>? positionIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? pageIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? timeText, kotlin.jvm.functions.Function0<kotlin.Unit> content);
   }
@@ -438,9 +423,6 @@
     method @Deprecated public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
   }
 
-  public final class ScalingLazyColumnMeasureKt {
-  }
-
   @Deprecated @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
     field @Deprecated public static final androidx.wear.compose.material.ScalingLazyListAnchorType.Companion Companion;
   }
@@ -574,9 +556,6 @@
     property public final androidx.compose.foundation.shape.CornerBasedShape small;
   }
 
-  public final class ShapesKt {
-  }
-
   public final class SliderKt {
     method @androidx.compose.runtime.Composable public static void InlineSlider(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, int steps, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional boolean segmented, optional androidx.wear.compose.material.InlineSliderColors colors);
     method @androidx.compose.runtime.Composable public static void InlineSlider(int value, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onValueChange, kotlin.ranges.IntProgression valueProgression, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean segmented, optional androidx.wear.compose.material.InlineSliderColors colors);
@@ -788,9 +767,6 @@
     property public final androidx.compose.ui.text.TextStyle title3;
   }
 
-  public final class TypographyKt {
-  }
-
   public final class VignetteKt {
     method @androidx.compose.runtime.Composable public static void Vignette(int vignettePosition, optional androidx.compose.ui.Modifier modifier);
   }
diff --git a/wear/tiles/tiles-tooling/api/current.txt b/wear/tiles/tiles-tooling/api/current.txt
index 8eb29b6..e6f50d0 100644
--- a/wear/tiles/tiles-tooling/api/current.txt
+++ b/wear/tiles/tiles-tooling/api/current.txt
@@ -1,8 +1 @@
 // Signature format: 4.0
-package androidx.wear.tiles.tooling {
-
-  public final class TileServiceViewAdapterKt {
-  }
-
-}
-
diff --git a/wear/tiles/tiles-tooling/api/public_plus_experimental_current.txt b/wear/tiles/tiles-tooling/api/public_plus_experimental_current.txt
index 8eb29b6..e6f50d0 100644
--- a/wear/tiles/tiles-tooling/api/public_plus_experimental_current.txt
+++ b/wear/tiles/tiles-tooling/api/public_plus_experimental_current.txt
@@ -1,8 +1 @@
 // Signature format: 4.0
-package androidx.wear.tiles.tooling {
-
-  public final class TileServiceViewAdapterKt {
-  }
-
-}
-
diff --git a/wear/tiles/tiles-tooling/api/restricted_current.txt b/wear/tiles/tiles-tooling/api/restricted_current.txt
index 8eb29b6..e6f50d0 100644
--- a/wear/tiles/tiles-tooling/api/restricted_current.txt
+++ b/wear/tiles/tiles-tooling/api/restricted_current.txt
@@ -1,8 +1 @@
 // Signature format: 4.0
-package androidx.wear.tiles.tooling {
-
-  public final class TileServiceViewAdapterKt {
-  }
-
-}
-
diff --git a/wear/watchface/watchface-client/api/current.ignore b/wear/watchface/watchface-client/api/current.ignore
index 8c1c73c..9a0c267 100644
--- a/wear/watchface/watchface-client/api/current.ignore
+++ b/wear/watchface/watchface-client/api/current.ignore
@@ -21,3 +21,7 @@
     Method androidx.wear.watchface.client.InteractiveWatchFaceClient.getPreviewReferenceInstant added thrown exception android.os.RemoteException
 ChangedThrows: androidx.wear.watchface.client.InteractiveWatchFaceClient#getUserStyleSchema():
     Method androidx.wear.watchface.client.InteractiveWatchFaceClient.getUserStyleSchema added thrown exception android.os.RemoteException
+
+
+RemovedClass: androidx.wear.watchface.client.WatchFaceExceptionKt:
+    Removed class androidx.wear.watchface.client.WatchFaceExceptionKt
diff --git a/wear/watchface/watchface-client/api/current.txt b/wear/watchface/watchface-client/api/current.txt
index 4e6173b..781eadf 100644
--- a/wear/watchface/watchface-client/api/current.txt
+++ b/wear/watchface/watchface-client/api/current.txt
@@ -213,9 +213,6 @@
     ctor public WatchFaceControlClient.ServiceStartFailureException(optional String message);
   }
 
-  public final class WatchFaceExceptionKt {
-  }
-
   public final class WatchFaceId {
     ctor public WatchFaceId(String id);
     method public String getId();
diff --git a/wear/watchface/watchface-client/api/public_plus_experimental_current.txt b/wear/watchface/watchface-client/api/public_plus_experimental_current.txt
index b48fa19..dc24d57 100644
--- a/wear/watchface/watchface-client/api/public_plus_experimental_current.txt
+++ b/wear/watchface/watchface-client/api/public_plus_experimental_current.txt
@@ -222,9 +222,6 @@
     ctor public WatchFaceControlClient.ServiceStartFailureException(optional String message);
   }
 
-  public final class WatchFaceExceptionKt {
-  }
-
   public final class WatchFaceId {
     ctor public WatchFaceId(String id);
     method public String getId();
diff --git a/wear/watchface/watchface-client/api/restricted_current.ignore b/wear/watchface/watchface-client/api/restricted_current.ignore
index 8c1c73c..9a0c267 100644
--- a/wear/watchface/watchface-client/api/restricted_current.ignore
+++ b/wear/watchface/watchface-client/api/restricted_current.ignore
@@ -21,3 +21,7 @@
     Method androidx.wear.watchface.client.InteractiveWatchFaceClient.getPreviewReferenceInstant added thrown exception android.os.RemoteException
 ChangedThrows: androidx.wear.watchface.client.InteractiveWatchFaceClient#getUserStyleSchema():
     Method androidx.wear.watchface.client.InteractiveWatchFaceClient.getUserStyleSchema added thrown exception android.os.RemoteException
+
+
+RemovedClass: androidx.wear.watchface.client.WatchFaceExceptionKt:
+    Removed class androidx.wear.watchface.client.WatchFaceExceptionKt
diff --git a/wear/watchface/watchface-client/api/restricted_current.txt b/wear/watchface/watchface-client/api/restricted_current.txt
index 4e6173b..781eadf 100644
--- a/wear/watchface/watchface-client/api/restricted_current.txt
+++ b/wear/watchface/watchface-client/api/restricted_current.txt
@@ -213,9 +213,6 @@
     ctor public WatchFaceControlClient.ServiceStartFailureException(optional String message);
   }
 
-  public final class WatchFaceExceptionKt {
-  }
-
   public final class WatchFaceId {
     ctor public WatchFaceId(String id);
     method public String getId();
diff --git a/wear/watchface/watchface-editor/api/current.ignore b/wear/watchface/watchface-editor/api/current.ignore
new file mode 100644
index 0000000..5bed420
--- /dev/null
+++ b/wear/watchface/watchface-editor/api/current.ignore
@@ -0,0 +1,5 @@
+// Baseline format: 1.0
+RemovedClass: androidx.wear.watchface.editor.EditorSessionKt:
+    Removed class androidx.wear.watchface.editor.EditorSessionKt
+RemovedClass: androidx.wear.watchface.editor.WatchFaceEditorContractKt:
+    Removed class androidx.wear.watchface.editor.WatchFaceEditorContractKt
diff --git a/wear/watchface/watchface-editor/api/current.txt b/wear/watchface/watchface-editor/api/current.txt
index a3e0615..6a24f7f 100644
--- a/wear/watchface/watchface-editor/api/current.txt
+++ b/wear/watchface/watchface-editor/api/current.txt
@@ -71,9 +71,6 @@
     method @UiThread @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public suspend Object? createOnWatchEditorSession(androidx.activity.ComponentActivity activity, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.EditorSession>) throws kotlinx.coroutines.TimeoutCancellationException;
   }
 
-  public final class EditorSessionKt {
-  }
-
   public final class PreviewScreenshotParams {
     ctor public PreviewScreenshotParams(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant);
     method public java.time.Instant getInstant();
@@ -93,8 +90,5 @@
   public static final class WatchFaceEditorContract.Companion {
   }
 
-  public final class WatchFaceEditorContractKt {
-  }
-
 }
 
diff --git a/wear/watchface/watchface-editor/api/public_plus_experimental_current.txt b/wear/watchface/watchface-editor/api/public_plus_experimental_current.txt
index a3e0615..6a24f7f 100644
--- a/wear/watchface/watchface-editor/api/public_plus_experimental_current.txt
+++ b/wear/watchface/watchface-editor/api/public_plus_experimental_current.txt
@@ -71,9 +71,6 @@
     method @UiThread @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public suspend Object? createOnWatchEditorSession(androidx.activity.ComponentActivity activity, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.EditorSession>) throws kotlinx.coroutines.TimeoutCancellationException;
   }
 
-  public final class EditorSessionKt {
-  }
-
   public final class PreviewScreenshotParams {
     ctor public PreviewScreenshotParams(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant);
     method public java.time.Instant getInstant();
@@ -93,8 +90,5 @@
   public static final class WatchFaceEditorContract.Companion {
   }
 
-  public final class WatchFaceEditorContractKt {
-  }
-
 }
 
diff --git a/wear/watchface/watchface-editor/api/restricted_current.ignore b/wear/watchface/watchface-editor/api/restricted_current.ignore
new file mode 100644
index 0000000..5bed420
--- /dev/null
+++ b/wear/watchface/watchface-editor/api/restricted_current.ignore
@@ -0,0 +1,5 @@
+// Baseline format: 1.0
+RemovedClass: androidx.wear.watchface.editor.EditorSessionKt:
+    Removed class androidx.wear.watchface.editor.EditorSessionKt
+RemovedClass: androidx.wear.watchface.editor.WatchFaceEditorContractKt:
+    Removed class androidx.wear.watchface.editor.WatchFaceEditorContractKt
diff --git a/wear/watchface/watchface-editor/api/restricted_current.txt b/wear/watchface/watchface-editor/api/restricted_current.txt
index a3e0615..6a24f7f 100644
--- a/wear/watchface/watchface-editor/api/restricted_current.txt
+++ b/wear/watchface/watchface-editor/api/restricted_current.txt
@@ -71,9 +71,6 @@
     method @UiThread @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public suspend Object? createOnWatchEditorSession(androidx.activity.ComponentActivity activity, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.EditorSession>) throws kotlinx.coroutines.TimeoutCancellationException;
   }
 
-  public final class EditorSessionKt {
-  }
-
   public final class PreviewScreenshotParams {
     ctor public PreviewScreenshotParams(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant);
     method public java.time.Instant getInstant();
@@ -93,8 +90,5 @@
   public static final class WatchFaceEditorContract.Companion {
   }
 
-  public final class WatchFaceEditorContractKt {
-  }
-
 }
 
diff --git a/wear/watchface/watchface-guava/api/current.ignore b/wear/watchface/watchface-guava/api/current.ignore
new file mode 100644
index 0000000..f4eee41
--- /dev/null
+++ b/wear/watchface/watchface-guava/api/current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.wear.watchface.ListenableGlesRendererKt:
+    Removed class androidx.wear.watchface.ListenableGlesRendererKt
diff --git a/wear/watchface/watchface-guava/api/current.txt b/wear/watchface/watchface-guava/api/current.txt
index 98993bd..dad2406 100644
--- a/wear/watchface/watchface-guava/api/current.txt
+++ b/wear/watchface/watchface-guava/api/current.txt
@@ -43,9 +43,6 @@
     method @UiThread public final void runUiThreadGlCommands(Runnable runnable);
   }
 
-  public final class ListenableGlesRendererKt {
-  }
-
   public abstract class ListenableWatchFaceService extends androidx.wear.watchface.WatchFaceService {
     ctor public ListenableWatchFaceService();
     method protected suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.ComplicationSlotsManager complicationSlotsManager, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace>);
diff --git a/wear/watchface/watchface-guava/api/public_plus_experimental_current.txt b/wear/watchface/watchface-guava/api/public_plus_experimental_current.txt
index 98993bd..dad2406 100644
--- a/wear/watchface/watchface-guava/api/public_plus_experimental_current.txt
+++ b/wear/watchface/watchface-guava/api/public_plus_experimental_current.txt
@@ -43,9 +43,6 @@
     method @UiThread public final void runUiThreadGlCommands(Runnable runnable);
   }
 
-  public final class ListenableGlesRendererKt {
-  }
-
   public abstract class ListenableWatchFaceService extends androidx.wear.watchface.WatchFaceService {
     ctor public ListenableWatchFaceService();
     method protected suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.ComplicationSlotsManager complicationSlotsManager, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace>);
diff --git a/wear/watchface/watchface-guava/api/restricted_current.ignore b/wear/watchface/watchface-guava/api/restricted_current.ignore
new file mode 100644
index 0000000..f4eee41
--- /dev/null
+++ b/wear/watchface/watchface-guava/api/restricted_current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedClass: androidx.wear.watchface.ListenableGlesRendererKt:
+    Removed class androidx.wear.watchface.ListenableGlesRendererKt
diff --git a/wear/watchface/watchface-guava/api/restricted_current.txt b/wear/watchface/watchface-guava/api/restricted_current.txt
index 98993bd..dad2406 100644
--- a/wear/watchface/watchface-guava/api/restricted_current.txt
+++ b/wear/watchface/watchface-guava/api/restricted_current.txt
@@ -43,9 +43,6 @@
     method @UiThread public final void runUiThreadGlCommands(Runnable runnable);
   }
 
-  public final class ListenableGlesRendererKt {
-  }
-
   public abstract class ListenableWatchFaceService extends androidx.wear.watchface.WatchFaceService {
     ctor public ListenableWatchFaceService();
     method protected suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.ComplicationSlotsManager complicationSlotsManager, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace>);
diff --git a/wear/watchface/watchface/api/current.ignore b/wear/watchface/watchface/api/current.ignore
new file mode 100644
index 0000000..ec425b1
--- /dev/null
+++ b/wear/watchface/watchface/api/current.ignore
@@ -0,0 +1,9 @@
+// Baseline format: 1.0
+RemovedClass: androidx.wear.watchface.ComplicationSlotsManagerKt:
+    Removed class androidx.wear.watchface.ComplicationSlotsManagerKt
+RemovedClass: androidx.wear.watchface.RenderBufferTextureKt:
+    Removed class androidx.wear.watchface.RenderBufferTextureKt
+RemovedClass: androidx.wear.watchface.RendererKt:
+    Removed class androidx.wear.watchface.RendererKt
+RemovedClass: androidx.wear.watchface.WatchFaceKt:
+    Removed class androidx.wear.watchface.WatchFaceKt
diff --git a/wear/watchface/watchface/api/current.txt b/wear/watchface/watchface/api/current.txt
index c61b6eb..9aec1ab 100644
--- a/wear/watchface/watchface/api/current.txt
+++ b/wear/watchface/watchface/api/current.txt
@@ -108,9 +108,6 @@
     method public default void onComplicationSlotTapped(int complicationSlotId);
   }
 
-  public final class ComplicationSlotsManagerKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComplicationTapFilter {
     method public default boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y, boolean includeMargins);
     method @Deprecated public default boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y);
@@ -136,9 +133,6 @@
     enum_constant public static final androidx.wear.watchface.DrawMode MUTE;
   }
 
-  public final class RenderBufferTextureKt {
-  }
-
   public final class RenderParameters {
     ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers, optional androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer, optional java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> lastComplicationTapDownEvents);
     ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers, optional androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer);
@@ -280,9 +274,6 @@
     method @UiThread public void onDestroy();
   }
 
-  public final class RendererKt {
-  }
-
   public final class RoundRectComplicationTapFilter implements androidx.wear.watchface.ComplicationTapFilter {
     ctor public RoundRectComplicationTapFilter();
   }
@@ -353,9 +344,6 @@
   public final class WatchFaceColorsKt {
   }
 
-  public final class WatchFaceKt {
-  }
-
   public abstract class WatchFaceService extends android.service.wallpaper.WallpaperService {
     ctor public WatchFaceService();
     method @WorkerThread protected androidx.wear.watchface.ComplicationSlotsManager createComplicationSlotsManager(androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
diff --git a/wear/watchface/watchface/api/public_plus_experimental_current.txt b/wear/watchface/watchface/api/public_plus_experimental_current.txt
index 99d275b..f654e9c 100644
--- a/wear/watchface/watchface/api/public_plus_experimental_current.txt
+++ b/wear/watchface/watchface/api/public_plus_experimental_current.txt
@@ -124,9 +124,6 @@
     method public default void onComplicationSlotTapped(int complicationSlotId);
   }
 
-  public final class ComplicationSlotsManagerKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComplicationTapFilter {
     method public default boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y, boolean includeMargins);
     method @Deprecated public default boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y);
@@ -152,9 +149,6 @@
     enum_constant public static final androidx.wear.watchface.DrawMode MUTE;
   }
 
-  public final class RenderBufferTextureKt {
-  }
-
   public final class RenderParameters {
     ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers, optional androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer, optional java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> lastComplicationTapDownEvents);
     ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers, optional androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer);
@@ -299,9 +293,6 @@
     method @UiThread public void onDestroy();
   }
 
-  public final class RendererKt {
-  }
-
   public final class RoundRectComplicationTapFilter implements androidx.wear.watchface.ComplicationTapFilter {
     ctor public RoundRectComplicationTapFilter();
   }
@@ -385,9 +376,6 @@
   @kotlin.RequiresOptIn(message="This is an experimental API that may change or be removed without warning.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface WatchFaceExperimental {
   }
 
-  public final class WatchFaceKt {
-  }
-
   public abstract class WatchFaceService extends android.service.wallpaper.WallpaperService {
     ctor public WatchFaceService();
     method @WorkerThread protected androidx.wear.watchface.ComplicationSlotsManager createComplicationSlotsManager(androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
diff --git a/wear/watchface/watchface/api/restricted_current.ignore b/wear/watchface/watchface/api/restricted_current.ignore
index 6cea676..148f834 100644
--- a/wear/watchface/watchface/api/restricted_current.ignore
+++ b/wear/watchface/watchface/api/restricted_current.ignore
@@ -1,4 +1,14 @@
 // Baseline format: 1.0
+RemovedClass: androidx.wear.watchface.ComplicationSlotsManagerKt:
+    Removed class androidx.wear.watchface.ComplicationSlotsManagerKt
+RemovedClass: androidx.wear.watchface.RenderBufferTextureKt:
+    Removed class androidx.wear.watchface.RenderBufferTextureKt
+RemovedClass: androidx.wear.watchface.RendererKt:
+    Removed class androidx.wear.watchface.RendererKt
+RemovedClass: androidx.wear.watchface.WatchFaceKt:
+    Removed class androidx.wear.watchface.WatchFaceKt
+
+
 RemovedMethod: androidx.wear.watchface.RenderParameters#RenderParameters(androidx.wear.watchface.data.RenderParametersWireFormat):
     Removed constructor androidx.wear.watchface.RenderParameters(androidx.wear.watchface.data.RenderParametersWireFormat)
 RemovedMethod: androidx.wear.watchface.RenderParameters#toWireFormat():
diff --git a/wear/watchface/watchface/api/restricted_current.txt b/wear/watchface/watchface/api/restricted_current.txt
index c61b6eb..9aec1ab 100644
--- a/wear/watchface/watchface/api/restricted_current.txt
+++ b/wear/watchface/watchface/api/restricted_current.txt
@@ -108,9 +108,6 @@
     method public default void onComplicationSlotTapped(int complicationSlotId);
   }
 
-  public final class ComplicationSlotsManagerKt {
-  }
-
   @kotlin.jvm.JvmDefaultWithCompatibility public interface ComplicationTapFilter {
     method public default boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y, boolean includeMargins);
     method @Deprecated public default boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y);
@@ -136,9 +133,6 @@
     enum_constant public static final androidx.wear.watchface.DrawMode MUTE;
   }
 
-  public final class RenderBufferTextureKt {
-  }
-
   public final class RenderParameters {
     ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers, optional androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer, optional java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> lastComplicationTapDownEvents);
     ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers, optional androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer);
@@ -280,9 +274,6 @@
     method @UiThread public void onDestroy();
   }
 
-  public final class RendererKt {
-  }
-
   public final class RoundRectComplicationTapFilter implements androidx.wear.watchface.ComplicationTapFilter {
     ctor public RoundRectComplicationTapFilter();
   }
@@ -353,9 +344,6 @@
   public final class WatchFaceColorsKt {
   }
 
-  public final class WatchFaceKt {
-  }
-
   public abstract class WatchFaceService extends android.service.wallpaper.WallpaperService {
     ctor public WatchFaceService();
     method @WorkerThread protected androidx.wear.watchface.ComplicationSlotsManager createComplicationSlotsManager(androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
diff --git a/work/work-runtime/api/current.txt b/work/work-runtime/api/current.txt
index 17b34bc..6964c18 100644
--- a/work/work-runtime/api/current.txt
+++ b/work/work-runtime/api/current.txt
@@ -62,9 +62,6 @@
     property public abstract androidx.work.Configuration workManagerConfiguration;
   }
 
-  public final class ConfigurationKt {
-  }
-
   public final class Constraints {
     ctor public Constraints(optional @androidx.room.ColumnInfo(name="required_network_type") androidx.work.NetworkType requiredNetworkType, optional @androidx.room.ColumnInfo(name="requires_charging") boolean requiresCharging, optional @androidx.room.ColumnInfo(name="requires_device_idle") boolean requiresDeviceIdle, optional @androidx.room.ColumnInfo(name="requires_battery_not_low") boolean requiresBatteryNotLow, optional @androidx.room.ColumnInfo(name="requires_storage_not_low") boolean requiresStorageNotLow, optional @androidx.room.ColumnInfo(name="trigger_content_update_delay") long contentTriggerUpdateDelayMillis, optional @androidx.room.ColumnInfo(name="trigger_max_content_delay") long contentTriggerMaxDelayMillis, optional @androidx.room.ColumnInfo(name="content_uri_triggers") java.util.Set<androidx.work.Constraints.ContentUriTrigger> contentUriTriggers);
     ctor public Constraints(androidx.work.Constraints other);
@@ -110,9 +107,6 @@
     property public final android.net.Uri uri;
   }
 
-  public final class ConstraintsKt {
-  }
-
   public final class Data {
     ctor public Data(androidx.work.Data);
     method @androidx.room.TypeConverter public static androidx.work.Data fromByteArray(byte[]);
@@ -204,9 +198,6 @@
     method public abstract androidx.work.InputMerger? createInputMerger(String className);
   }
 
-  public final class InputMergerKt {
-  }
-
   public abstract class ListenableWorker {
     ctor public ListenableWorker(android.content.Context, androidx.work.WorkerParameters);
     method public final android.content.Context getApplicationContext();
diff --git a/work/work-runtime/api/public_plus_experimental_current.txt b/work/work-runtime/api/public_plus_experimental_current.txt
index 17b34bc..6964c18 100644
--- a/work/work-runtime/api/public_plus_experimental_current.txt
+++ b/work/work-runtime/api/public_plus_experimental_current.txt
@@ -62,9 +62,6 @@
     property public abstract androidx.work.Configuration workManagerConfiguration;
   }
 
-  public final class ConfigurationKt {
-  }
-
   public final class Constraints {
     ctor public Constraints(optional @androidx.room.ColumnInfo(name="required_network_type") androidx.work.NetworkType requiredNetworkType, optional @androidx.room.ColumnInfo(name="requires_charging") boolean requiresCharging, optional @androidx.room.ColumnInfo(name="requires_device_idle") boolean requiresDeviceIdle, optional @androidx.room.ColumnInfo(name="requires_battery_not_low") boolean requiresBatteryNotLow, optional @androidx.room.ColumnInfo(name="requires_storage_not_low") boolean requiresStorageNotLow, optional @androidx.room.ColumnInfo(name="trigger_content_update_delay") long contentTriggerUpdateDelayMillis, optional @androidx.room.ColumnInfo(name="trigger_max_content_delay") long contentTriggerMaxDelayMillis, optional @androidx.room.ColumnInfo(name="content_uri_triggers") java.util.Set<androidx.work.Constraints.ContentUriTrigger> contentUriTriggers);
     ctor public Constraints(androidx.work.Constraints other);
@@ -110,9 +107,6 @@
     property public final android.net.Uri uri;
   }
 
-  public final class ConstraintsKt {
-  }
-
   public final class Data {
     ctor public Data(androidx.work.Data);
     method @androidx.room.TypeConverter public static androidx.work.Data fromByteArray(byte[]);
@@ -204,9 +198,6 @@
     method public abstract androidx.work.InputMerger? createInputMerger(String className);
   }
 
-  public final class InputMergerKt {
-  }
-
   public abstract class ListenableWorker {
     ctor public ListenableWorker(android.content.Context, androidx.work.WorkerParameters);
     method public final android.content.Context getApplicationContext();
diff --git a/work/work-runtime/api/restricted_current.txt b/work/work-runtime/api/restricted_current.txt
index 17b34bc..6964c18 100644
--- a/work/work-runtime/api/restricted_current.txt
+++ b/work/work-runtime/api/restricted_current.txt
@@ -62,9 +62,6 @@
     property public abstract androidx.work.Configuration workManagerConfiguration;
   }
 
-  public final class ConfigurationKt {
-  }
-
   public final class Constraints {
     ctor public Constraints(optional @androidx.room.ColumnInfo(name="required_network_type") androidx.work.NetworkType requiredNetworkType, optional @androidx.room.ColumnInfo(name="requires_charging") boolean requiresCharging, optional @androidx.room.ColumnInfo(name="requires_device_idle") boolean requiresDeviceIdle, optional @androidx.room.ColumnInfo(name="requires_battery_not_low") boolean requiresBatteryNotLow, optional @androidx.room.ColumnInfo(name="requires_storage_not_low") boolean requiresStorageNotLow, optional @androidx.room.ColumnInfo(name="trigger_content_update_delay") long contentTriggerUpdateDelayMillis, optional @androidx.room.ColumnInfo(name="trigger_max_content_delay") long contentTriggerMaxDelayMillis, optional @androidx.room.ColumnInfo(name="content_uri_triggers") java.util.Set<androidx.work.Constraints.ContentUriTrigger> contentUriTriggers);
     ctor public Constraints(androidx.work.Constraints other);
@@ -110,9 +107,6 @@
     property public final android.net.Uri uri;
   }
 
-  public final class ConstraintsKt {
-  }
-
   public final class Data {
     ctor public Data(androidx.work.Data);
     method @androidx.room.TypeConverter public static androidx.work.Data fromByteArray(byte[]);
@@ -204,9 +198,6 @@
     method public abstract androidx.work.InputMerger? createInputMerger(String className);
   }
 
-  public final class InputMergerKt {
-  }
-
   public abstract class ListenableWorker {
     ctor public ListenableWorker(android.content.Context, androidx.work.WorkerParameters);
     method public final android.content.Context getApplicationContext();