I can’t comment on the trolley count, but I agree with you about the diet tonic being an abomination. I believe its removal is as a result of the sugar tax (that’s pushing-up the price from wholesale through to retail). I’ve noticed places like M&S stores at motorway services have only sucralose-based drinks these days (and whatever the purported flavour, they taste equally foul to me).