final cleanups for report