Removed JPA and XML errors.