Further remove Google+ special case