another round of script-location cleanup