remove references to wand