cleaning up for v2