Remove/replace some MW specific code

Change-Id: Iabb09eded5ee9bbba2306ef7116ff75632cbb790
Merge "Remove/replace some MW specific code"