Final cleanup before merging.