Clean up post-merge