More cleanups.