Refactor, delete photo stub