Remove p700 remainants

Change-Id: I90b5609900ac163c05691aec9c8a2d4631203001