diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/AutomergerModule.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/AutomergerModule.java
index 87adb7c..9b21b2c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/AutomergerModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/AutomergerModule.java
@@ -16,10 +16,10 @@
 
 import static com.google.gerrit.server.change.RevisionResource.REVISION_KIND;
 
-import com.google.gerrit.extensions.events.CommentAddedListener;
 import com.google.gerrit.extensions.events.ChangeAbandonedListener;
 import com.google.gerrit.extensions.events.ChangeMergedListener;
 import com.google.gerrit.extensions.events.ChangeRestoredListener;
+import com.google.gerrit.extensions.events.CommentAddedListener;
 import com.google.gerrit.extensions.events.DraftPublishedListener;
 import com.google.gerrit.extensions.events.RevisionCreatedListener;
 import com.google.gerrit.extensions.events.TopicEditedListener;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java
index df61148..e02ceb5 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java
@@ -402,7 +402,7 @@
           sdsMergeInput.downstreamBranch);
     }
 
-    ChangeApi newChangeApi = gApi.changes().create(downstreamChangeInput);
+    gApi.changes().create(downstreamChangeInput);
   }
 
   private void loadConfig() throws IOException, RestApiException {
@@ -514,8 +514,7 @@
       originalChange.restore(restoreInput);
     }
 
-    ChangeInfo updatedChange = originalChange.createMergePatchSet(mergePatchSetInput);
-    ChangeApi updatedChangeApi = gApi.changes().id(updatedChange.id);
+    originalChange.createMergePatchSet(mergePatchSetInput);
   }
 
   private String getPreviousRevision(ChangeApi change, int currentPatchSetNumber)
diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/LoadedConfig.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/LoadedConfig.java
index 32b5b4a..30691b0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/LoadedConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/LoadedConfig.java
@@ -185,7 +185,7 @@
   }
 
   private Pattern getConfigPattern(String key) {
-    Set<String> mergeStrings = new HashSet<String>((List<String>) global.get(key));
+    Set<String> mergeStrings = new HashSet<>((List<String>) global.get(key));
     return Pattern.compile(Joiner.on("|").join(mergeStrings), Pattern.DOTALL);
   }
 }
diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorTest.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorTest.java
index b78ae6d..c8fad3f 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorTest.java
@@ -17,7 +17,6 @@
 import com.google.gerrit.extensions.api.GerritApi;
 import com.google.gerrit.extensions.api.changes.AbandonInput;
 import com.google.gerrit.extensions.api.changes.ChangeApi;
-import com.google.gerrit.extensions.api.changes.ReviewInput;
 import com.google.gerrit.extensions.api.changes.RevisionApi;
 import com.google.gerrit.extensions.client.ListChangesOption;
 import com.google.gerrit.extensions.common.ChangeInfo;
@@ -167,7 +166,7 @@
 
   @Test
   public void testCreateDownstreamMerges() throws Exception {
-    Map<String, Boolean> downstreamBranchMap = new HashMap<String, Boolean>();
+    Map<String, Boolean> downstreamBranchMap = new HashMap<>();
     downstreamBranchMap.put("testone", true);
     downstreamBranchMap.put("testtwo", true);
 
@@ -191,7 +190,7 @@
 
   @Test
   public void testCreateDownstreamMerges_withPreviousRevisions() throws Exception {
-    Map<String, Boolean> downstreamBranchMap = new HashMap<String, Boolean>();
+    Map<String, Boolean> downstreamBranchMap = new HashMap<>();
     downstreamBranchMap.put("testone", true);
     downstreamBranchMap.put("testtwo", true);