Cleanup
Removed jpa