Added GalleryGoogle and clean up