Tweaking scripts to eliminate extra files