Remove out-of-date setup data sheets
Fix upgrade 1123 to be more defensive about creating new folder