Make cleanup more robust