Add task to clean-up temporary files + clean-up