Remove remaining references to tools