Final merger cleanup