diff --git a/app/src/main/java/com/android/calendar/CalendarEventModel.java b/app/src/main/java/com/android/calendar/CalendarEventModel.java
index 0d40e260e..62884d1e9 100644
--- a/app/src/main/java/com/android/calendar/CalendarEventModel.java
+++ b/app/src/main/java/com/android/calendar/CalendarEventModel.java
@@ -31,7 +31,6 @@
 import com.android.calendar.event.EditEventHelper;
 import com.android.calendar.event.EventColorCache;
 import com.android.calendar.event.ExtendedProperty;
-import com.android.calendar.icalendar.VEvent;
 import com.android.calendar.settings.GeneralPreferences;
 import com.android.common.Rfc822Validator;
 
diff --git a/app/src/main/java/com/android/calendar/EventInfoFragment.java b/app/src/main/java/com/android/calendar/EventInfoFragment.java
index eba09c2c1..831bcc489 100644
--- a/app/src/main/java/com/android/calendar/EventInfoFragment.java
+++ b/app/src/main/java/com/android/calendar/EventInfoFragment.java
@@ -136,7 +136,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
diff --git a/app/src/main/java/com/android/calendar/alerts/AlertReceiver.java b/app/src/main/java/com/android/calendar/alerts/AlertReceiver.java
index c01e87444..bc62b918c 100644
--- a/app/src/main/java/com/android/calendar/alerts/AlertReceiver.java
+++ b/app/src/main/java/com/android/calendar/alerts/AlertReceiver.java
@@ -17,9 +17,7 @@
 
 package com.android.calendar.alerts;
 
-import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC;
 import static com.android.calendar.alerts.AlertService.ALERT_CHANNEL_ID;
-import static com.android.calendar.alerts.AlertService.FOREGROUND_CHANNEL_ID;
 
 import android.app.Notification;
 import android.app.PendingIntent;
@@ -51,9 +49,6 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.ServiceCompat;
-
 import com.android.calendar.DynamicTheme;
 import com.android.calendar.Utils;
 import com.android.calendar.alerts.AlertService.NotificationWrapper;
diff --git a/app/src/main/java/com/android/calendar/event/EditEventHelper.java b/app/src/main/java/com/android/calendar/event/EditEventHelper.java
index 39fdf576a..b7126a8d8 100644
--- a/app/src/main/java/com/android/calendar/event/EditEventHelper.java
+++ b/app/src/main/java/com/android/calendar/event/EditEventHelper.java
@@ -23,7 +23,6 @@
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.provider.CalendarContract;
 import android.provider.CalendarContract.Attendees;
 import android.provider.CalendarContract.Calendars;
 import android.provider.CalendarContract.Colors;
diff --git a/app/src/main/java/com/android/calendar/event/EditEventView.java b/app/src/main/java/com/android/calendar/event/EditEventView.java
index 3bdbb1730..8c8329684 100644
--- a/app/src/main/java/com/android/calendar/event/EditEventView.java
+++ b/app/src/main/java/com/android/calendar/event/EditEventView.java
@@ -16,7 +16,6 @@
 
 package com.android.calendar.event;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.DatePickerDialog;
 import android.app.ProgressDialog;
@@ -100,10 +99,8 @@
 import java.util.Arrays;
 import java.util.Formatter;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
-import java.util.stream.Collectors;
 
 import ws.xsoh.etar.R;
 
diff --git a/app/src/main/java/com/android/calendar/event/ExtendedProperty.java b/app/src/main/java/com/android/calendar/event/ExtendedProperty.java
index a2c7e00e2..118a89a79 100644
--- a/app/src/main/java/com/android/calendar/event/ExtendedProperty.java
+++ b/app/src/main/java/com/android/calendar/event/ExtendedProperty.java
@@ -1,7 +1,6 @@
 package com.android.calendar.event;
 
 import android.content.ContentResolver;
-import android.content.ContentUris;
 import android.net.Uri;
 import android.provider.CalendarContract;
 import android.provider.CalendarContract.ExtendedProperties;
diff --git a/app/src/main/java/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java b/app/src/main/java/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
index ecdaef0c4..522fb1818 100644
--- a/app/src/main/java/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
+++ b/app/src/main/java/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
@@ -17,11 +17,9 @@
 package com.android.calendar.selectcalendars;
 
 import android.content.Context;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
 import android.provider.CalendarContract.Calendars;
 import android.view.LayoutInflater;
 import android.view.TouchDelegate;
diff --git a/app/src/main/java/com/android/calendar/widget/CalendarAppWidgetProvider.java b/app/src/main/java/com/android/calendar/widget/CalendarAppWidgetProvider.java
index bfcbd594f..34e29126f 100644
--- a/app/src/main/java/com/android/calendar/widget/CalendarAppWidgetProvider.java
+++ b/app/src/main/java/com/android/calendar/widget/CalendarAppWidgetProvider.java
@@ -42,8 +42,6 @@
 import com.android.calendar.event.EditEventActivity;
 import com.android.calendarcommon2.Time;
 
-import java.util.Calendar;
-
 import ws.xsoh.etar.R;
 
 /**