more removal of old mediawiki class junk

Change-Id: Ic04c4b43b0c0ef3f3d4df43a83259553b44c9865
Merge "more removal of old mediawiki class junk" into production