Bunch of cleanup for BuddySocial