Removing persistence.xml, fixing some issues with dependencies