remove obsolete tools
upstream fixes
Merge pull request #1 from sbillard/master

updates