Clean up from merge