Added switch to skip workspace cleanup.