Rm old b/c code. MF now requires MW master

Change-Id: I7a562887fafa232aa3caa474cc018e378c1eb55e
Merge "Rm old b/c code. MF now requires MW master"