* Moving to new BuddyClient model

please remove