Bunch of cleanup for BuddySocial

Yes, I will have Erik confirm exactly what we do and dont need here, but that will happen after initial release.