Almost final cleanups.