Remove camera related config changes

Change-Id: Iad5bd850e632d4f8e0b9b0d3e79234c33efaee49
Remove unneeded stuff

Change-Id: I8b0f832dab7ec7180a291dda19c2667f3620e753