removed JPA-incompatible components for now