removed v1 stuff from v2