Google+ Removal

Since Google+ is going away soon, is there a plan to globally remove Google+ social media links from landing/web page and email templates? My org has a ton of templates with Google+ still on them, so I'm hoping HubSpot will delete Google+ integration entirely to save time. Thank you!