remove async refactoring that lead to races

the two async task leads to races on mPhotos field