Merge pull request #39 from chuckleb/master

Restored cleanup scripts to functions