cleanup for p700

Change-Id: I31e48c726a18a3853e10ab36ba2efabb338e4011