Cleanup - use different var for setup vs. cmd script directories