added updated and removed photo messages
Merge branch 'chore/remove-photo-message' into dev
code refactorized