Removed dependence on OpenJPA