Post-merger cleanup