FIX: Ensuring the temp folder is deleted at the end (main branch)

FIX: Ensuring the temp folder is deleted at the end (main branch) #384