Cleanups for performance.