Wand tm cleanup2