removing all the mw-relate overrides

Change-Id: Ia28546a5fe572d960934031a22c7865c8de8593b