more cleanup of old mediawiki class

Change-Id: I01ab99de644ed62e4970cba7b41b6c1aac027f16
Merge "more cleanup of old mediawiki class" into production