Kill wmf9 stuff

Change-Id: Iba23e7fb519580e4f98f827e112e95385131e700