Make sure that cleanup() function is always called

Added {HEADERFILE_BREACH} to temporary files that should be removed
Removed obsolete cleanup calls

21 lines removed - next up: refactoring of #FIXME: I know this sucks and getoptS is better :)