diff --git a/play-services-base/src/main/java/com/google/android/gms/common/api/GoogleApiClient.java b/play-services-base/src/main/java/com/google/android/gms/common/api/GoogleApiClient.java
index fb7088e6..51832e17 100644
--- a/play-services-base/src/main/java/com/google/android/gms/common/api/GoogleApiClient.java
+++ b/play-services-base/src/main/java/com/google/android/gms/common/api/GoogleApiClient.java
@@ -143,7 +143,7 @@ public interface GoogleApiClient {
      * @see #registerConnectionFailedListener(OnConnectionFailedListener)
      * @see #unregisterConnectionFailedListener(OnConnectionFailedListener)
      */
-    public boolean isConnectionFailedListenerRegistered(OnConnectionFailedListener listener);
+    boolean isConnectionFailedListenerRegistered(OnConnectionFailedListener listener);
 
     /**
      * Closes the current connection to Google Play services and creates a new connection.
@@ -198,7 +198,7 @@ public interface GoogleApiClient {
      * @param listener the listener where the results of the asynchronous {@link #connect()} call
      *                 are delivered.
      */
-    public void registerConnectionFailedListener(OnConnectionFailedListener listener);
+    void registerConnectionFailedListener(OnConnectionFailedListener listener);
 
     /**
      * Disconnects the client and stops automatic lifecycle management. Use this before creating a
diff --git a/play-services-base/src/main/java/com/google/android/gms/common/api/PendingResult.java b/play-services-base/src/main/java/com/google/android/gms/common/api/PendingResult.java
index ec162920..e3881366 100644
--- a/play-services-base/src/main/java/com/google/android/gms/common/api/PendingResult.java
+++ b/play-services-base/src/main/java/com/google/android/gms/common/api/PendingResult.java
@@ -40,20 +40,20 @@ public interface PendingResult<R extends Result> {
      * Blocks until the task is completed. This is not allowed on the UI thread. The returned
      * result object can have an additional failure mode of INTERRUPTED.
      */
-    public R await();
+    R await();
 
     /**
      * Blocks until the task is completed or has timed out waiting for the result. This is not
      * allowed on the UI thread. The returned result object can have an additional failure mode
      * of either INTERRUPTED or TIMEOUT.
      */
-    public R await(long time, TimeUnit unit);
+    R await(long time, TimeUnit unit);
 
-    public void cancel();
+    void cancel();
 
-    public boolean isCanceled();
+    boolean isCanceled();
 
-    public void setResultCallback(ResultCallback<R> callback, long time, TimeUnit unit);
+    void setResultCallback(ResultCallback<R> callback, long time, TimeUnit unit);
 
-    public void setResultCallback(ResultCallback<R> callback);
+    void setResultCallback(ResultCallback<R> callback);
 }
diff --git a/play-services-basement/src/main/java/com/google/android/gms/common/api/Result.java b/play-services-basement/src/main/java/com/google/android/gms/common/api/Result.java
index 3ed0bd7e..6c4f6921 100644
--- a/play-services-basement/src/main/java/com/google/android/gms/common/api/Result.java
+++ b/play-services-basement/src/main/java/com/google/android/gms/common/api/Result.java
@@ -23,5 +23,5 @@ import org.microg.gms.common.PublicApi;
  */
 @PublicApi
 public interface Result {
-    public Status getStatus();
+    Status getStatus();
 }
diff --git a/play-services-basement/src/main/java/com/google/android/gms/common/api/ResultCallback.java b/play-services-basement/src/main/java/com/google/android/gms/common/api/ResultCallback.java
index 1cac879c..f6c46b06 100644
--- a/play-services-basement/src/main/java/com/google/android/gms/common/api/ResultCallback.java
+++ b/play-services-basement/src/main/java/com/google/android/gms/common/api/ResultCallback.java
@@ -29,5 +29,5 @@ public interface ResultCallback<R extends Result> {
      *
      * @param result The result from the API call. May not be null.
      */
-    public void onResult(R result);
+    void onResult(R result);
 }
diff --git a/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java b/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java
index ab282dd5..53916aba 100644
--- a/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java
+++ b/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java
@@ -40,7 +40,7 @@ import static android.os.Build.VERSION.SDK_INT;
 public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener,
         View.OnClickListener {
 
-    public static interface OnSwitchChangeListener {
+    public interface OnSwitchChangeListener {
         /**
          * Called when the checked state of the Switch has changed.
          *
diff --git a/play-services-core/src/main/java/org/microg/gms/common/HttpFormClient.java b/play-services-core/src/main/java/org/microg/gms/common/HttpFormClient.java
index 8aee1df7..5838258f 100644
--- a/play-services-core/src/main/java/org/microg/gms/common/HttpFormClient.java
+++ b/play-services-core/src/main/java/org/microg/gms/common/HttpFormClient.java
@@ -217,25 +217,25 @@ public class HttpFormClient {
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.FIELD)
     public @interface RequestHeader {
-        public String[] value();
+        String[] value();
 
-        public boolean truePresent() default true;
+        boolean truePresent() default true;
 
-        public boolean falsePresent() default false;
+        boolean falsePresent() default false;
 
-        public boolean nullPresent() default false;
+        boolean nullPresent() default false;
     }
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.FIELD)
     public @interface RequestContent {
-        public String[] value();
+        String[] value();
 
-        public boolean truePresent() default true;
+        boolean truePresent() default true;
 
-        public boolean falsePresent() default false;
+        boolean falsePresent() default false;
 
-        public boolean nullPresent() default false;
+        boolean nullPresent() default false;
     }
 
     @Retention(RetentionPolicy.RUNTIME)
@@ -246,13 +246,13 @@ public class HttpFormClient {
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.FIELD)
     public @interface ResponseField {
-        public String value();
+        String value();
     }
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.FIELD)
     public @interface ResponseHeader {
-        public String value();
+        String value();
     }
 
     @Retention(RetentionPolicy.RUNTIME)
diff --git a/play-services-tasks/src/main/java/com/google/android/gms/tasks/OnCanceledListener.java b/play-services-tasks/src/main/java/com/google/android/gms/tasks/OnCanceledListener.java
index 32fd7b0f..a52e4622 100644
--- a/play-services-tasks/src/main/java/com/google/android/gms/tasks/OnCanceledListener.java
+++ b/play-services-tasks/src/main/java/com/google/android/gms/tasks/OnCanceledListener.java
@@ -18,5 +18,5 @@ public interface OnCanceledListener {
     /**
      * Called when the Task is canceled successfully.
      */
-    public abstract void onCanceled();
+    void onCanceled();
 }