Get rid of JPA in some classes