cleanup tailor/cane issues