todo tip, and remove some more old v2 code