More reporter cleanup