Medium: Make iscsi-cleanup more robust