diff --git a/src/com/android/telecomm/CallServiceWrapper.java b/src/com/android/telecomm/CallServiceWrapper.java
index 72e1041..067b715 100644
--- a/src/com/android/telecomm/CallServiceWrapper.java
+++ b/src/com/android/telecomm/CallServiceWrapper.java
@@ -26,8 +26,6 @@
 import android.telecomm.ICallServiceAdapter;
 import android.util.Log;
 
-import com.android.telecomm.ServiceBinder.BindCallback;
-
 /**
  * Wrapper for {@link ICallService}s, handles binding to {@link ICallService} and keeps track of
  * when the object can safely be unbound. Other classes should not use {@link ICallService} directly
diff --git a/src/com/android/telecomm/InCallAdapter.java b/src/com/android/telecomm/InCallAdapter.java
index 9faa472..170f66b 100644
--- a/src/com/android/telecomm/InCallAdapter.java
+++ b/src/com/android/telecomm/InCallAdapter.java
@@ -18,7 +18,6 @@
 
 import android.os.Handler;
 import android.os.Looper;
-import android.os.RemoteException;
 import android.telecomm.IInCallAdapter;
 import android.util.Log;
 
@@ -42,7 +41,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public void answerCall(final String callId) throws RemoteException {
+    public void answerCall(final String callId) {
         Log.d(TAG, "answerCall(" + callId + ")");
         mHandler.post(new Runnable() {
             @Override public void run() {
@@ -53,7 +52,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public void rejectCall(final String callId) throws RemoteException {
+    public void rejectCall(final String callId) {
         Log.d(TAG, "rejectCall(" + callId + ")");
         mHandler.post(new Runnable() {
             @Override public void run() {
@@ -64,12 +63,11 @@
 
     /** {@inheritDoc} */
     @Override
-    public void disconnectCall(final String callId) throws RemoteException {
+    public void disconnectCall(final String callId) {
         mHandler.post(new Runnable() {
             @Override public void run() {
                 mCallsManager.disconnectCall(callId);
             }
         });
     }
-
 }
diff --git a/src/com/android/telecomm/Switchboard.java b/src/com/android/telecomm/Switchboard.java
index 2ef58e3..b7482b8 100644
--- a/src/com/android/telecomm/Switchboard.java
+++ b/src/com/android/telecomm/Switchboard.java
@@ -16,7 +16,6 @@
 
 package com.android.telecomm;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
@@ -28,7 +27,6 @@
 import android.telecomm.TelecommConstants;
 import android.util.Log;
 
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;