Added ability to bypass the v1 directory clean up for debugging purposes