Upgrade sufia, equivalent-xml and remove headless