Remove naive2, rename naive3 to naive2