cleanup, merged all of wikiutils