Make sure that cleanup() function is always called

Added {HEADERFILE_BREACH} to temporary files that should be removed
Removed obsolete cleanup calls
Merge pull request #30 from PeterMosmans/cleanup

Make sure that cleanup() function is always called