diff --git a/pom.xml b/pom.xml
index 2a8d2b752..9fc8813ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,16 +175,6 @@
   </build>
 
   <dependencies>
-  	<dependency>
-  		<groupId>org.hamcrest</groupId>
-  		<artifactId>hamcrest-all</artifactId>
-  		<version>1.3</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>com.googlecode.lambdaj</groupId>
-  		<artifactId>lambdaj</artifactId>
-  		<version>2.3.3</version>
-	  </dependency>
     <dependency>
       <groupId>com.atlassian.jira</groupId>
       <artifactId>jira-rest-java-client-api</artifactId>
@@ -310,11 +300,27 @@
     </dependency>
 
     <!-- Upper bound dependencies -->
+
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
       <version>3.7</version>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>script-security</artifactId>
+      <version>1.16</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>structs</artifactId>
+      <version>1.7</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>credentials</artifactId>
+      <version>2.1.19</version>
+    </dependency>
 
     <!-- test dependencies -->
     <dependency>
@@ -330,6 +336,18 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
@@ -379,31 +397,11 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.objenesis</groupId>
-      <artifactId>objenesis</artifactId>
-      <version>2.1</version>
-    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
       <version>1.3</version>
     </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>script-security</artifactId>
-      <version>1.16</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>structs</artifactId>
-      <version>1.7</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>credentials</artifactId>
-      <version>2.1.19</version>
-    </dependency>
   </dependencies>
 
 
diff --git a/src/main/java/hudson/plugins/jira/JiraVersionMatcher.java b/src/main/java/hudson/plugins/jira/JiraVersionMatcher.java
deleted file mode 100644
index 3b218b834..000000000
--- a/src/main/java/hudson/plugins/jira/JiraVersionMatcher.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package hudson.plugins.jira;
-
-import hudson.plugins.jira.model.JiraVersion;
-import org.hamcrest.FeatureMatcher;
-import org.hamcrest.Matcher;
-
-public class JiraVersionMatcher {
-
-	public static Matcher<JiraVersion> hasName(Matcher<String> subMatcher) {
-		return new FeatureMatcher<JiraVersion, String>(subMatcher, 
-				"expected version name", "actual version name") {
-			@Override
-			protected String featureValueOf(JiraVersion version) {
-				return version.getName();
-			}
-		};
-	}
-
-}
\ No newline at end of file