more cleanup of scripts