Bunch of cleanup for BuddySocial

Yes, sadly this is "iOS" Convention.