More CI cleanup from branch fix_ci_attempt_2
More CI cleanup from branch fix_ci_attempt_2

Charcoal-SE/metasmoke,j-f1/forked-metasmoke,j-f1/forked-metasmoke,j-f1/forked-metasmoke,Charcoal-SE/metasmoke,Charcoal-SE/metasmoke,Charcoal-SE/metasmoke,j-f1/forked-metasmoke