Some more cleanup of script files