Cleanup tools/*

Details in the commit comments.

Review / stay of execution by @paulp