Modified PhotoActivity
Remove unused function
Clean code, remove unused function