1) removes unused, deprecated methods from .h files
1) ensures that the "deliveredWithItems" property is really treated and parsed as a group of "doubleWithItems"