merged both persistence.xml files, cleanup