Final cleanup and changes.