jpa project code cleanup