diff --git a/service-t/src/com/android/server/net/BpfInterfaceMapHelper.java b/service-t/src/com/android/server/net/BpfInterfaceMapHelper.java
index 1aa35a4..3c95b8e 100644
--- a/service-t/src/com/android/server/net/BpfInterfaceMapHelper.java
+++ b/service-t/src/com/android/server/net/BpfInterfaceMapHelper.java
@@ -16,12 +16,6 @@
 package com.android.server.net;
 
 import android.os.Build;
-import android.content.Context;
-import android.net.INetd;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.os.ServiceSpecificException;
 import android.system.ErrnoException;
 import android.util.IndentingPrintWriter;
 import android.util.Log;
@@ -29,11 +23,9 @@
 import androidx.annotation.RequiresApi;
 
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.net.module.util.BaseNetdUnsolicitedEventListener;
 import com.android.net.module.util.BpfDump;
 import com.android.net.module.util.BpfMap;
 import com.android.net.module.util.IBpfMap;
-import com.android.net.module.util.InterfaceParams;
 import com.android.net.module.util.Struct.S32;
 
 /**
diff --git a/tests/unit/java/com/android/server/net/BpfInterfaceMapHelperTest.java b/tests/unit/java/com/android/server/net/BpfInterfaceMapHelperTest.java
index 294e45f..7b3bea3 100644
--- a/tests/unit/java/com/android/server/net/BpfInterfaceMapHelperTest.java
+++ b/tests/unit/java/com/android/server/net/BpfInterfaceMapHelperTest.java
@@ -21,19 +21,10 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
 
-import android.content.Context;
-import android.net.INetd;
-import android.net.MacAddress;
 import android.os.Build;
-import android.os.Handler;
-import android.os.test.TestLooper;
 import android.system.ErrnoException;
 import android.util.IndentingPrintWriter;
 
@@ -41,7 +32,6 @@
 
 import com.android.net.module.util.BaseNetdUnsolicitedEventListener;
 import com.android.net.module.util.IBpfMap;
-import com.android.net.module.util.InterfaceParams;
 import com.android.net.module.util.Struct.S32;
 import com.android.testutils.DevSdkIgnoreRule;
 import com.android.testutils.DevSdkIgnoreRunner;
@@ -50,8 +40,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 import java.io.PrintWriter;