Clean up Post-merging