removed v1 code