diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingContext.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingContext.java
index 3da952c24..0829ec6a9 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingContext.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingContext.java
@@ -21,6 +21,7 @@ import java.beans.IntrospectionException;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -161,6 +162,10 @@ public class BasicMappingContext implements MappingContext, InitializingBean, Ap
             log.error(e.getMessage(), e);
           }
         }
+      }, new ReflectionUtils.FieldFilter() {
+        public boolean matches(Field field) {
+          return !Modifier.isStatic(field.getModifiers());
+        }
       });
 
       entity.setPreferredConstructor(builder.getPreferredConstructor(type));
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/util/ClassTypeInformation.java b/spring-data-commons-core/src/main/java/org/springframework/data/util/ClassTypeInformation.java
index 33db8b261..6c6e97dcb 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/util/ClassTypeInformation.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/util/ClassTypeInformation.java
@@ -20,26 +20,15 @@ public class ClassTypeInformation extends TypeDiscoverer {
    * @param type
    */
   public ClassTypeInformation(Class<?> type) {
-    this(type, GenericTypeResolver.getTypeVariableMap(type), null, null);
-  }
-
-  /**
-   * Creates {@link ClassTypeInformation} for the given type and the given basic types. Handing over a basic type will
-   * prevent it's nested fields to be traversed for further {@link TypeInformation}.
-   * 
-   * @param type
-   * @param basicTypes
-   */
-  public ClassTypeInformation(Class<?> type, Set<Class<?>> basicTypes) {
-    this(type, GenericTypeResolver.getTypeVariableMap(type), basicTypes, null);
+    this(type, GenericTypeResolver.getTypeVariableMap(type), null);
   }
 
   ClassTypeInformation(Class<?> type, TypeDiscoverer parent) {
-    this(type, null, null, parent);
+    this(type, null, parent);
   }
 
   @SuppressWarnings("rawtypes")
-  ClassTypeInformation(Class<?> type, Map<TypeVariable, Type> typeVariableMap, Set<Class<?>> basicTypes,
+  ClassTypeInformation(Class<?> type, Map<TypeVariable, Type> typeVariableMap,
       TypeDiscoverer parent) {
     super(type, typeVariableMap, parent);
     this.type = type;