Tournament reader cleanups.