Removed XWiki specific code from generic tool