BAC-150: CreateWiki cleanup