removed v1 stuff