Remove unused import
Remove unnecessary photo iterator

- Remove inner photo iterator class
- Remove test cases for photo iterator
Merge branch 'dev'