Merge branch 'jc/setup-cleanup-fix'