Final cleanup.