Final cleanups.