removed unnecessary JPA/JDO stuff