remove camery hacks

Change-Id: Id3b06be7282aebef8415f023580fb553ca9c324c