#59 delete unless code