Removed CameraActivity and its layout file as they were not actually
needed.
touched up a couple things after removing CameraActivity