JPA cleanups