diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityBinding.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityBinding.java
index b2598bc6a1..0af9603a2d 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityBinding.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityBinding.java
@@ -23,7 +23,6 @@
  */
 package org.hibernate.metamodel.binding;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractTableSpecification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractTableSpecification.java
index 6163c34f15..b5a3461c14 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractTableSpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractTableSpecification.java
@@ -24,9 +24,7 @@
 package org.hibernate.metamodel.relational;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -39,7 +37,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 public abstract class AbstractTableSpecification implements TableSpecification {
 	private final static AtomicInteger tableCounter = new AtomicInteger( 0 );
 	private final int tableNumber;
-	private final LinkedHashMap<String,SimpleValue> values = new LinkedHashMap<String,SimpleValue>();
+	private final LinkedHashMap<String, SimpleValue> values = new LinkedHashMap<String, SimpleValue>();
 	private PrimaryKey primaryKey = new PrimaryKey( this );
 	private List<ForeignKey> foreignKeys = new ArrayList<ForeignKey>();
 
@@ -59,21 +57,21 @@ public abstract class AbstractTableSpecification implements TableSpecification {
 
 	@Override
 	public Column getOrCreateColumn(String name) {
-		if(values.containsKey( name )){
+		if ( values.containsKey( name ) ) {
 			return (Column) values.get( name );
 		}
 		final Column column = new Column( this, values.size(), name );
-		values.put(name, column );
+		values.put( name, column );
 		return column;
 	}
 
 	@Override
 	public DerivedValue getOrCreateDerivedValue(String fragment) {
-		if(values.containsKey( fragment )){
+		if ( values.containsKey( fragment ) ) {
 			return (DerivedValue) values.get( fragment );
 		}
 		final DerivedValue value = new DerivedValue( this, values.size(), fragment );
-		values.put(fragment, value );
+		values.put( fragment, value );
 		return value;
 	}
 
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java
index 331c65fba6..c820dd9ee4 100644
--- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java
+++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java
@@ -34,7 +34,6 @@ import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.IdentifiableType;
 import javax.persistence.metamodel.PluralAttribute;
 import javax.persistence.metamodel.Type;
-import org.hibernate.EntityMode;
 import org.hibernate.annotations.common.AssertionFailure;
 import org.hibernate.ejb.internal.EntityManagerMessageLogger;
 import org.hibernate.mapping.Collection;