Added 'skip_cleanup' param