Lots of cleanup. Just need one more class for FriendDB