More changes to remove YUI/MW 1.16 support

Change-Id: I359c71a2497df99ccb00e7f37f3d051271dd5ccc