cleanup

Change-Id: I6dfe2da962c99208920d5208b1f3a52d1ddfba8e
working wifi and trying p500 camera changes

Change-Id: I1eb353a326337a7e38239cfef7eea91a65b25a02