moved into v1, like namespace suggests
removed useless stuff
removed useless part