Cleanups for paper.