US21 - remove FriendRequest classes by adding status field on Friend