Cosmetics
Remove unused references
Update to JPA 2.1 grammars for persistence.xml