more cleaning of ToolManager