Clean-up from merge