More cleaning of target folder on exit