Merge from 3.0: remove bogus static initialisers.