wikiretriever, cleanup usage message and calls to it

Change-Id: I38ca7a018e234441fcbe45b952730a7797a88004