EST-417: more slimming down of fixtures.