Add --disable-optimization; try to keep style of script & remove residue