remove references to wand
Merge pull request #5 from krman/cleanup

remove references to wand