More JPA DAO cleanup