Cleaned up JPA Entity classes.