organize cleanup after use in a better way

[suchoudh]

the rm -i needs to be more effective so we are not left with a lot of cruft.

[suchoudh]

perhaps can keep zipped files and remove the entire zip.

This will disable making direct changes in the git as well.