Complete rewrite of tools to suck less
Remove old stuff