Remove average-value test code