removed old v1 code