Remove some references to the Toolserver.