Fix remove friend bugs