removed all v1 stuff from master