Remove obsolete toolwrapper