diff --git a/src/javax/persistence/Entity.java b/src/javax/persistence/Entity.java
index 024df1bb5..a4bc1b912 100644
--- a/src/javax/persistence/Entity.java
+++ b/src/javax/persistence/Entity.java
@@ -40,4 +40,11 @@ public @interface Entity {
      * @return String
 	 */
 	String name() default "";
+    
+    /**
+     * (Optional) The comment of the entity.
+     *
+     * @return String
+     */
+    String comment() default "";
 }
diff --git a/src/javax/persistence/GeneratedValue.java b/src/javax/persistence/GeneratedValue.java
index 0d66f074a..56056e790 100644
--- a/src/javax/persistence/GeneratedValue.java
+++ b/src/javax/persistence/GeneratedValue.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/** *****************************************************************************
  * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -12,7 +12,7 @@
  *     Linda DeMichiel - Java Persistence 2.1
  *     Linda DeMichiel - Java Persistence 2.0
  *
- ******************************************************************************/
+ ***************************************************************************** */
 package javax.persistence;
 
 import java.lang.annotation.Target;
@@ -23,13 +23,14 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
  * Provides for the specification of generation strategies for the
- * values of primary keys. 
+ * values of primary keys.
  *
- * <p> The <code>GeneratedValue</code> annotation
+ * <p>
+ * The <code>GeneratedValue</code> annotation
  * may be applied to a primary key property or field of an entity or
  * mapped superclass in conjunction with the {@link Id} annotation.
  * The use of the <code>GeneratedValue</code> annotation is only
- * required to be supported for simple primary keys.  Use of the
+ * required to be supported for simple primary keys. Use of the
  * <code>GeneratedValue</code> annotation is not supported for derived
  * primary keys.
  *
@@ -58,22 +59,5 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 @Retention(RUNTIME)
 
 public @interface GeneratedValue {
-    /**
-     * (Optional) The primary key generation strategy
-     * that the persistence provider must use to
-     * generate the annotated entity primary key.
-     * @return GenerationType
-     */
-    @Deprecated
-    GenerationType strategy() default GenerationType.AUTO;
 
-    /**
-     * (Optional) The name of the primary key generator
-     * to use as specified in the SequenceGenerator
-     * or TableGenerator annotation.
-     * <p> Defaults to the id generator supplied by persistence provider.
-     * @return  String
-     */
-    @Deprecated
-    String generator() default "";
 }
diff --git a/src/javax/persistence/GenerationType.java b/src/javax/persistence/GenerationType.java
deleted file mode 100644
index 9d1980e83..000000000
--- a/src/javax/persistence/GenerationType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- *     Linda DeMichiel - Java Persistence 2.1
- *     Linda DeMichiel - Java Persistence 2.0
- *
- ******************************************************************************/
-package javax.persistence;
-
-/** 
- * Defines the types of primary key generation strategies. 
- *
- * @see GeneratedValue
- *
- * @since Java Persistence 1.0
- */
-public enum GenerationType { 
-
-    /**
-     * Indicates that the persistence provider must assign 
-     * primary keys for the entity using an underlying 
-     * database table to ensure uniqueness.
-     */
-    TABLE, 
-
-    /**
-     * Indicates that the persistence provider must assign 
-     * primary keys for the entity using a database sequence.
-     */
-    SEQUENCE, 
-
-    /**
-     * Indicates that the persistence provider must assign 
-     * primary keys for the entity using a database identity column.
-     */
-    IDENTITY, 
-
-    /**
-     * Indicates that the persistence provider should pick an 
-     * appropriate strategy for the particular database. The 
-     * <code>AUTO</code> generation strategy may expect a database 
-     * resource to exist, or it may attempt to create one. A vendor 
-     * may provide documentation on how to create such resources 
-     * in the event that it does not support schema generation 
-     * or cannot create the schema resource at runtime.
-     */
-    AUTO
-}