diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/Parameter.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/Parameter.java
index b02429fc3..d8d267caf 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/Parameter.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/Parameter.java
@@ -47,7 +47,6 @@ public class Parameter {
 	private static final String NAMED_PARAMETER_TEMPLATE = ":%s";
 	private static final String POSITION_PARAMETER_TEMPLATE = "?%s";
 
-	private final Parameters parameters;
 	private final MethodParameter parameter;
 
 	/**
@@ -59,13 +58,11 @@ public class Parameter {
 	 * @param index
 	 * @param name
 	 */
-	protected Parameter(MethodParameter parameter, Parameters parameters) {
+	protected Parameter(MethodParameter parameter) {
 
 		Assert.notNull(parameter);
-		Assert.notNull(parameters);
 
 		this.parameter = parameter;
-		this.parameters = parameters;
 
 		if (isSpecialParameter() && isNamedParameter()) {
 			throw new IllegalArgumentException(PARAM_ON_SPECIAL);
@@ -84,30 +81,6 @@ public class Parameter {
 	}
 
 
-	/**
-	 * Returns the next {@link Parameter} from the surrounding
-	 * {@link Parameters}.
-	 *
-	 * @return
-	 * @throws ParameterOutOfBoundsException
-	 */
-	public Parameter getNext() {
-
-		return parameters.getParameter(getIndex() + 1);
-	}
-
-
-	/**
-	 * Returns the previous {@link Parameter}.
-	 *
-	 * @return
-	 */
-	Parameter getPrevious() {
-
-		return parameters.getParameter(getIndex() - 1);
-	}
-
-
 	/**
 	 * Returns whether the parameter is a special parameter.
 	 *
@@ -204,7 +177,7 @@ public class Parameter {
 		return format("%s:%s", isNamedParameter() ? getName() : "#" + getIndex(),
 				getType().getName());
 	}
-
+	
 
 	/**
 	 * Returns whether the {@link Parameter} is a {@link Pageable} parameter.
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/Parameters.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/Parameters.java
index 95788ea1c..9e2054e05 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/Parameters.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/Parameters.java
@@ -109,7 +109,7 @@ public class Parameters implements Iterable<Parameter> {
 	}
 	
 	protected Parameter createParameter(MethodParameter parameter) {
-		return new Parameter(parameter, this);
+		return new Parameter(parameter);
 	}
 
 
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/util/ClassUtils.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/util/ClassUtils.java
index 3709d676a..77d30112e 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/util/ClassUtils.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/util/ClassUtils.java
@@ -52,7 +52,7 @@ public abstract class ClassUtils {
 
 		Class<?> type = method.getReturnType();
 
-		if (Collection.class.isAssignableFrom(type) || Page.class.isAssignableFrom(type)) {
+		if (Iterable.class.isAssignableFrom(type)) {
 
 			ParameterizedType returnType = (ParameterizedType) method.getGenericReturnType();
 			Type componentType = returnType.getActualTypeArguments()[0];