JPA DAO cleanup