More code deleted. Tests pass locally.