diff --git a/src/main/java/org/testng/internal/BaseTestMethod.java b/src/main/java/org/testng/internal/BaseTestMethod.java
index 0165b92..8aa78a7 100755
--- a/src/main/java/org/testng/internal/BaseTestMethod.java
+++ b/src/main/java/org/testng/internal/BaseTestMethod.java
@@ -1,5 +1,15 @@
 package org.testng.internal;
 
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
 import org.testng.IClass;
 import org.testng.IRetryAnalyzer;
 import org.testng.ITestClass;
@@ -15,10 +25,6 @@
 import org.testng.xml.XmlInclude;
 import org.testng.xml.XmlTest;
 
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.regex.Pattern;
-
 /**
  * Superclass to represent both &#64;Test and &#64;Configuration methods.
  */
diff --git a/src/main/java/org/testng/internal/ConfigurationMethod.java b/src/main/java/org/testng/internal/ConfigurationMethod.java
index 75c7eaf..1237245 100755
--- a/src/main/java/org/testng/internal/ConfigurationMethod.java
+++ b/src/main/java/org/testng/internal/ConfigurationMethod.java
@@ -1,17 +1,29 @@
 package org.testng.internal;
 
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 import org.testng.ITestNGMethod;
 import org.testng.annotations.IAnnotation;
 import org.testng.annotations.IConfigurationAnnotation;
 import org.testng.annotations.ITestAnnotation;
 import org.testng.collections.Lists;
 import org.testng.collections.Maps;
-import org.testng.internal.annotations.*;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import org.testng.internal.annotations.AnnotationHelper;
+import org.testng.internal.annotations.ConfigurationAnnotation;
+import org.testng.internal.annotations.IAfterClass;
+import org.testng.internal.annotations.IAfterGroups;
+import org.testng.internal.annotations.IAfterMethod;
+import org.testng.internal.annotations.IAfterSuite;
+import org.testng.internal.annotations.IAfterTest;
+import org.testng.internal.annotations.IAnnotationFinder;
+import org.testng.internal.annotations.IBeforeClass;
+import org.testng.internal.annotations.IBeforeGroups;
+import org.testng.internal.annotations.IBeforeMethod;
+import org.testng.internal.annotations.IBeforeSuite;
+import org.testng.internal.annotations.IBeforeTest;
 
 public class ConfigurationMethod extends BaseTestMethod {
   /**
@@ -72,6 +84,7 @@
   /**
    * @deprecated use #ConfigurationMethod(ConstructorOrMethod,...) instead.
    */
+  @Deprecated
   public ConfigurationMethod(Method method,
                              IAnnotationFinder annotationFinder,
                              boolean isBeforeSuite,