Start removing some now unused code in SocialBundle, refactor a couple places to support the addons