Cleanup cameras

Change-Id: I8f12046cd03a7b546292c8dbb45615823a8bc667