Also remove mwpfh

Change-Id: Ic73cdedf415443878753ba3f4acf3cb383a35562