REmove use of Datanucleus JPA/JDO