More report cleanup.