Fix removal of vanilla tools