diff --git a/src/main/java/org/kohsuke/github/GHRepository.java b/src/main/java/org/kohsuke/github/GHRepository.java
index 27478c89ec..30952fa155 100644
--- a/src/main/java/org/kohsuke/github/GHRepository.java
+++ b/src/main/java/org/kohsuke/github/GHRepository.java
@@ -835,7 +835,7 @@ public String getDefaultBranch() {
      */
     @SuppressFBWarnings(value = { "EI_EXPOSE_REP" }, justification = "Expected")
     public GHRepository getTemplateRepository() {
-        return (GHRepository) template_repository;
+        return template_repository;
     }
 
     /**
diff --git a/src/main/java/org/kohsuke/github/extras/okhttp3/OkHttpGitHubConnector.java b/src/main/java/org/kohsuke/github/extras/okhttp3/OkHttpGitHubConnector.java
index d61fde220b..f1c7679230 100644
--- a/src/main/java/org/kohsuke/github/extras/okhttp3/OkHttpGitHubConnector.java
+++ b/src/main/java/org/kohsuke/github/extras/okhttp3/OkHttpGitHubConnector.java
@@ -2,7 +2,6 @@
 
 import okhttp3.*;
 import org.apache.commons.io.IOUtils;
-import org.kohsuke.github.*;
 import org.kohsuke.github.connector.GitHubConnector;
 import org.kohsuke.github.connector.GitHubConnectorRequest;
 import org.kohsuke.github.connector.GitHubConnectorResponse;
diff --git a/src/test/java/org/kohsuke/github/AbstractGitHubWireMockTest.java b/src/test/java/org/kohsuke/github/AbstractGitHubWireMockTest.java
index 7cea51bda0..7d85d343eb 100644
--- a/src/test/java/org/kohsuke/github/AbstractGitHubWireMockTest.java
+++ b/src/test/java/org/kohsuke/github/AbstractGitHubWireMockTest.java
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.util.*;
 
-import static org.hamcrest.Matchers.*;
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
diff --git a/src/test/java/org/kohsuke/github/GHRateLimitTest.java b/src/test/java/org/kohsuke/github/GHRateLimitTest.java
index 5ec59ebb50..b7c8c807a4 100644
--- a/src/test/java/org/kohsuke/github/GHRateLimitTest.java
+++ b/src/test/java/org/kohsuke/github/GHRateLimitTest.java
@@ -188,7 +188,7 @@ public void testGitHubRateLimit() throws Exception {
         // Verify the requesting a search url updates the search rate limit
         assertThat(gitHub.lastRateLimit().getSearch().getRemaining(), equalTo(30));
 
-        HashMap<String, Object> searchResult = (HashMap<String, Object>) gitHub.createRequest()
+        HashMap<String, Object> searchResult = gitHub.createRequest()
                 .rateLimit(RateLimitTarget.SEARCH)
                 .setRawUrlPath(mockGitHub.apiServer().baseUrl()
                         + "/search/repositories?q=tetris+language%3Aassembly&sort=stars&order=desc")
diff --git a/src/test/java/org/kohsuke/github/GitHubStaticTest.java b/src/test/java/org/kohsuke/github/GitHubStaticTest.java
index a00f4c95b9..5c4e9b68eb 100644
--- a/src/test/java/org/kohsuke/github/GitHubStaticTest.java
+++ b/src/test/java/org/kohsuke/github/GitHubStaticTest.java
@@ -19,7 +19,6 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.fail;
 
 // TODO: Auto-generated Javadoc
 /**
diff --git a/src/test/java/org/kohsuke/github/extras/okhttp3/GitHubCachingTest.java b/src/test/java/org/kohsuke/github/extras/okhttp3/GitHubCachingTest.java
index f66717f31a..b58b784dc6 100644
--- a/src/test/java/org/kohsuke/github/extras/okhttp3/GitHubCachingTest.java
+++ b/src/test/java/org/kohsuke/github/extras/okhttp3/GitHubCachingTest.java
@@ -19,8 +19,6 @@
 import java.io.File;
 import java.io.IOException;
 
-import static org.junit.Assert.fail;
-
 // TODO: Auto-generated Javadoc
 /**
  * Test showing the behavior of OkHttpGitHubConnector cache with GitHub 404 responses.