Cleaning up report modules