Pruned cruft.