Completely remove the old xml parser