Minor removes (related to mega commit)
Fixed: PSQL exception (Persistence.xml updated)