Revert "Not available in omni's camera app"

This reverts commit a575267c0d04155aeeadea08c5fd63d1594cf13a.
Revert "Cleanup camera"

This reverts commit 9121a4f142690c43ac35f38365e83e8f73d47890.