Get rid of LPM

Change-Id: I03e06cd9d2feab9d845f62e4c58f73e8c363f33c
Get rid of more LPM stuff

Change-Id: I97c0f1055f605fa7e9323e19efe1cdbf800bfc68