BBC: Use service type in item type metadata and clean up old, now irrelevant code