clean up and v1 ready