p350: clean up

Change-Id: I6243e269f6ffea11f3e765f13af794f863f54e2d