Remove code from merge that shouldn't be there