removing more old commented out v2 code