Cleanings from merge issue