cleaning up for v1