Quick fixes

Removed obsolete temporary dir
Cleanup is standard now (optional to be toggled in code)