Post merge clean up.