Fixes #152 - Crash on iOS7 iPad quick photo

- Also removed unnecessary code