diff --git a/CHANGELOG.md b/CHANGELOG.md
index 224008f7e..47498be79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,30 +1,5 @@
-
 # Changelog
 
-## [1.0.8-rc33] - unstable
-
-### Added
-
-### Changed
-
-### Fixed
-
-* [PostIt.Android] Avoid applying camera sensor rotation twice: account for the rotation already included in Camera2's SurfaceTexture matrix before rotating encoder input, while retaining portrait output dimensions.
-* [PostIt.Android] Fix zero-second camera captures after adding OpenGL rotation: align Camera2 timestamps with the recorder's monotonic clock, preserve frame intervals, ignore duplicate frames and start camera requests only after the encoder is ready. Add a real Camera2/microphone regression check for segment duration and H.264/AAC tracks.
-* [PostIt.Android] Keep the `VideoLAN.LibVLC.Android` JNI/native bindings alive in Release builds with a ProGuard rule set so the bundled `libvlc`/`libc++_shared` libraries are not stripped.
-* [PostIt.Android] Rotate camera frames before H.264 encoding using an OpenGL surface, based on sensor orientation, lens facing and display rotation at capture start. Portrait captures swap the encoded dimensions; live MPEG-TS/HLS and replays no longer depend on an ineffective MP4-only orientation hint. Restore compilation by reading display orientation from the activity rather than the capture service.
-
-## [1.0.8-rc32] - unstable
-
-### Added
-
-### Changed
-
-### Fixed
-
-* Performer notification audience
-* [PostIt.Android] Upgrade `VideoLAN.LibVLC.Android` to 3.7.0-beta to resolve the runtime `failed to load libc++_shared.so` problem on 16 KiB-page Android devices and document the native-library compatibility requirement.
-
 ## [1.0.8-rc31] - unstable
 
 ### Added
@@ -41,6 +16,7 @@
 * avoid NRE in MailSender on rdv query notifications
 * Android emulator smoke test skipped in CI because Calabash instrumentation signature mismatches the target APK on hosted runners
 
+
 ## [1.0.8-rc30] - unstable
 
 ### Added
diff --git a/INSTALL.md b/INSTALL.md
index 5cea2b6f0..99c4f04b5 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -166,15 +166,6 @@ at IDR frames, with timestamps used for segment durations. Closed segments
 enter the same ordered upload/retry/quota/replay pipeline as desktop.
 Devices without a supported camera/encoder report a startup error.
 
-Camera frames are rotated through an OpenGL surface before encoding, so both
-live playback and replays have upright pixels without relying on rotation
-metadata (not supported by the MPEG-TS recorder). The sensor, front/rear lens
-and display orientation are sampled when capture starts; portrait output swaps
-width and height. Camera2 may already include sensor rotation in the
-SurfaceTexture transform; only the remaining rotation is applied by OpenGL.
-Keep that device orientation during a broadcast, or stop and
-start a new broadcast after turning the device.
-
 A camera/microphone foreground service and a partial wake lock maintain the
 broadcast when PostIt is backgrounded or the screen locks. Its ongoing
 notification returns to the app and offers **Arreter et publier**. Stopping
@@ -185,13 +176,12 @@ camera; segments already received by the server remain available under the
 interrupted-replay rules above. Device power policies can impose additional
 restrictions and must be tested on the intended physical devices.
 
-**Native library compatibility:** the Android app now uses
-`VideoLAN.LibVLC.Android` 3.7.0-beta, which is the minimum compatible package
-for 16 KiB-page devices. Older 3.6.5 binaries can fail at runtime with
-`failed to load libc++_shared.so` or the linker error `XA0141` because the
-native libraries are not aligned for 16 KiB memory pages. A successful APK
-build or a test on a 4 KiB-page emulator does not establish compatibility
-for 16 KiB-page devices or Play distribution requiring that alignment.
+**Native library limitation:** bundled `VideoLAN.LibVLC.Android` 3.6.5 emits
+`XA0141`: its native libraries are not aligned for 16 KiB memory pages.
+Playback on 16 KiB-page devices and store distribution requiring this alignment
+are not validated/supported by this package choice. A compatible native LibVLC
+release is required before claiming that support; a successful APK build or
+a test on a 4 KiB-page emulator does not establish it.
 
 Build with the Android workload and SDK configured:
 
diff --git a/doc/README.md b/doc/README.md
index 10e32b0c9..fb9bea943 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -16,7 +16,6 @@ La racine de l'architecture est [Architecture.md](Architecture.md).
 | [architecture/offres-frontmatter.md](architecture/offres-frontmatter.md) | Offre fournisseur, ClasseFormulaire, ClasseDevis, parsing frontmatter |
 | [architecture/postit-oidc.md](architecture/postit-oidc.md) | Client desktop PostIt, custom URI scheme, silent refresh |
 | [architecture/postit.md](architecture/postit.md) | PostIt — topologie des projets, ViewLocator custo, navigation, DI, conventions de binding |
-| [architecture/notifications.md](architecture/notifications.md) | Notifications persistées, messages Web et événements temps réel côté serveur, Web et PostIt |
 | [architecture/decoupage-organisation.md](architecture/decoupage-organisation.md) | Découpage des projets .NET (Abstract, Server, Org, Api, Blogs, Web, Org.Tests) |
 | [testing.md](testing.md) | Stratégie de test : conventions des dossiers, EF Core in-memory, auth stubs, scaffold partagé |
 | [onboarding-agents.md](onboarding-agents.md) | Parcours pas-à-pas pour prise en main agents IA + architecture + tests |
diff --git a/doc/architecture/notifications.md b/doc/architecture/notifications.md
deleted file mode 100644
index 8cf85cfb8..000000000
--- a/doc/architecture/notifications.md
+++ /dev/null
@@ -1,229 +0,0 @@
-# Notifications Yavsc : serveur, Web et PostIt
-
-Ce document décrit les mécanismes de notification actuellement présents
-dans le dépôt. Le terme « notification » recouvre plusieurs flux distincts :
-
-1. les **annonces persistées** en base, affichées dans le site Web et sur
-   l'accueil de PostIt ;
-2. les **messages temporaires de l'interface Web**, attachés à une réponse
-   MVC par `ViewBag.Notify` ;
-3. les **événements temps réel** du chat et les événements métier diffusés par
-   SignalR.
-
-Ces flux n'ont ni le même stockage, ni le même cycle de vie, ni les mêmes
-clients.
-
-## Vue d'ensemble
-
-| Flux | Serveur / transport | Web | PostIt |
-|---|---|---|---|
-| Annonce persistée | Entité `Notification` en base, API HTTP | Affichée dans le layout et masquable | Liste sur `HomePage`, chargée par HTTP et masquable |
-| Message d'interface | Liste de portée requête dans `ViewBag.Notify` | Affichée comme alerte dans le layout | Non consommé |
-| Événement de chat | Hub SignalR authentifié à `/chathub` | Le site Web n'en consomme pas dans ses vues MVC | `notifyUser` et `notifyRoom` alimentent les journaux du chat |
-| Événement métier `push` | SignalR vers les connexions actives, plus e-mail | Pas de consommateur identifié dans les vues Web | Pas de gestionnaire `push` dans le client PostIt actuel |
-
-Les notifications persistées sont donc différentes d'une notification système
-native (notification du navigateur ou du système d'exploitation). Le client
-PostIt affiche une liste dans sa page d'accueil ; il ne demande pas de
-permission de notification native.
-
-## 1. Annonces persistées
-
-### Modèle et stockage
-
-L'entité partagée [`Notification`](../../src/Yavsc.Abstract/Messaging/Notification.cs)
-est enregistrée dans la table `Notification` via `ApplicationDbContext`.
-Elle contient :
-
-- `Id`, identifiant généré ;
-- `title` et `body`, obligatoires, limités respectivement à 1 024 et 512
-  caractères ;
-- `icon`, `sound`, `tag`, `color`, propriétés optionnelles ;
-- `click_action`, obligatoire, utilisé comme libellé d'action dans les
-  interfaces ;
-- `Target`, chaîne de ciblage. Les valeurs documentées par le modèle sont
-  `null` (tout le monde), `user/{UserId}`, `pub/{topic}` et
-  `administration`.
-
-Le masquage d'une annonce pour un utilisateur connecté est stocké dans
-`DismissClicked`, avec une clé composée de l'identifiant utilisateur et de
-l'identifiant de notification. Le même avis peut ainsi être masqué
-indépendamment par chaque utilisateur.
-
-### API
-
-[`NotificationsApiController`](../../src/Yavsc.Api/Controllers/Administration/NotificationsApiController.cs)
-expose les deux routes GET suivantes, sous le préfixe `/api/v1` :
-
-| Route | Accès | Résultat |
-|---|---|---|
-| `GET /api/v1/notifications` | Anonyme ou authentifié | Notifications visibles à l'appelant, non masquées |
-| `GET /api/v1/notifications/me` | Anonyme ou authentifié | Même action et mêmes règles que la route sans suffixe |
-
-La réponse est une liste JSON triée par `Id` décroissant. L'API exclut les
-notifications masquées par l'utilisateur authentifié, puis applique les
-règles d'audience : cible vide, cible `pub/…`, cible correspondant à
-`user/{identifiant courant}`, ou cible `administration` pour un administrateur.
-Une requête anonyme n'a ni identifiant utilisateur ni rôle administrateur.
-
-[`DismissClicksApiController`](../../src/Yavsc.Api/Controllers/Administration/DismissClicksApiController.cs)
-est réservé aux utilisateurs authentifiés :
-
-| Route | Effet |
-|---|---|
-| `GET /api/v1/dismiss` | Liste les identifiants masqués par l'utilisateur |
-| `POST /api/v1/dismiss/click/{notificationId}` | Masque l'avis pour l'utilisateur ; l'opération est idempotente |
-| `DELETE /api/v1/dismiss/click/{notificationId}` | Rétablit l'avis s'il était masqué ; renvoie `404` sinon |
-
-Le POST renvoie `404` si l'identifiant de notification n'existe pas. Le modèle
-de réponse est [`DismissedNotification`](../../src/Yavsc.Abstract/Messaging/DismissedNotification.cs).
-
-### Création et notifications métier
-
-Le contrôleur MVC
-[`NotificationsController`](../../src/Yavsc.Org/Controllers/Communicating/NotificationsController.cs)
-permet la gestion CRUD des enregistrements de notification.
-
-Le service [`YavscMessageSender`](../../src/Yavsc.Server/Services/YavscMessageSender.cs)
-crée aussi une notification persistée, ciblée sur `user/{id}`, pour les
-événements `RdvQueryEvent` et `ClientEstimateSignedEvent`. L'enregistrement
-est effectué avant l'envoi d'e-mail. Le même service tente ensuite d'envoyer
-un e-mail si l'adresse est disponible et confirmée, puis diffuse l'événement
-`push` aux connexions SignalR actives de l'utilisateur.
-
-Cette diffusion `push` est conditionnée par la présence de connexions actives ;
-l'avis stocké en base reste, lui, disponible lors d'une récupération ultérieure
-par l'API.
-
-## 2. Site Web
-
-### Annonces persistées sur l'accueil
-
-[`HomeController.Index`](../../src/Yavsc.Org/Controllers/HomeController.cs)
-charge les notifications non masquées et les place dans `ViewBag.Notify`.
-[`_Layout.cshtml`](../../src/Yavsc.Org/Views/Shared/_Layout.cshtml) les rend
-comme des alertes Bootstrap avec icône, titre, corps et action. Le titre et le
-corps passent par les composants Markdown du site.
-
-Le clic sur l'action appelle `POST /Home/DismissNotification/{id}` via
-[`site.js`](../../src/Yavsc.Org/wwwroot/js/site.js) :
-
-- pour un utilisateur connecté, le masquage est enregistré dans
-  `DismissClicked` ;
-- pour un visiteur anonyme, les identifiants sont conservés dans la session
-  Web (`clicked`).
-
-La route renvoie `404` si l'avis n'existe pas et `204` après le masquage.
-Comme l'API, l'accueil Web filtre `Target` : les cibles `user/{id}` ne sont
-visibles qu'à l'utilisateur correspondant, et la cible `administration`
-uniquement aux administrateurs. Un visiteur anonyme ne reçoit que les
-notifications publiques (`Target` vide ou préfixe `pub/`).
-
-### Messages temporaires par requête
-
-Les helpers [`NotifyInfo`, `NotifyWarning` et `Notify`](../../src/Yavsc.Org/Helpers/ControllerHelpers.cs)
-ajoutent des objets à `ViewBag.Notify`. Ce mécanisme n'écrit pas en base :
-il ne vit que dans la réponse MVC qui rend le layout. Les méthodes
-`NotifyInfo` et `NotifyWarning` partagent actuellement le même rendu générique
-`alert-info`.
-
-## 3. PostIt
-
-[`NotificationsApiClient`](../../src/Yavsc.Api.Client/NotificationsApiClient.cs)
-construit les routes à partir de la base d'API de l'hôte métier configuré.
-Il fournit les méthodes de lecture publique et authentifiée, ainsi que les
-opérations de lecture, masquage et restauration.
-
-Sur [`HomePage`](../../src/PostIt/PostIt/Views/Layout/HomePage.axaml),
-[`HomePageViewModel`](../../src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs)
-charge la liste :
-
-- sans session valide, il appelle la route publique
-  `GET /api/v1/notifications` ;
-- avec une session valide, il appelle
-  `GET /api/v1/notifications/me` avec le client HTTP authentifié.
-
-Le chargement est lancé à l'ouverture de la page et relancé lorsque l'état de
-connexion change. Un compteur de version ignore les réponses obsolètes si un
-chargement plus récent a déjà commencé. L'interface distingue l'état de
-chargement, la liste vide et l'erreur de chargement ; l'utilisateur peut aussi
-actualiser manuellement.
-
-Le bouton d'une notification utilise `click_action` comme libellé et masque
-l'élément. En session authentifiée, PostIt appelle
-`POST /api/v1/dismiss/click/{id}` avant de retirer l'élément de la liste. Si
-l'appel échoue, l'élément reste affiché et une erreur est présentée. Sans
-session, l'élément est retiré de la liste locale, sans persistance du
-masquage côté serveur.
-
-## 4. Événements temps réel
-
-### Hub du chat
-
-Le hub [`ChatHub`](../../src/Yavsc.Server/Hubs/ChatHub.cs) est publié par
-Yavsc.Api à la racine sous `/chathub` (et non sous `/api/v1`) et porte
-`[Authorize]`. Il s'appuie sur SignalR et sur `IConnexionManager` pour suivre
-les utilisateurs et les salons.
-
-Les événements de notification émis par le hub comprennent notamment :
-
-| Événement SignalR | Données | Utilisation PostIt |
-|---|---|---|
-| `notifyUser` | `type`, identifiant ou nom cible, message | Ajout au journal système |
-| `notifyRoom` | `type`, salon, utilisateur ou détail | Ajout au journal du salon ; met à jour la liste d'utilisateurs sur `UserJoin` |
-| `joint` | `ChatRoomInfo` | Initialise la vue du salon rejoint |
-| `ReceiveMessage` | message avec nom, salon et corps | Ajoute le message à l'historique du salon |
-| `notifyUserInRoom` | `type`, salon, message | Pas de gestionnaire correspondant dans `ChatViewModel` actuellement |
-
-Les constantes de types du chat sont déclarées dans
-[`NotificationTypes`](../../src/Yavsc.Abstract/Messaging/NotificationTypes.cs).
-Les messages `notifyUser` et `notifyRoom` ne sont pas enregistrés en base :
-ils décrivent l'état temps réel de connexion, de salon ou les erreurs de
-conversation.
-
-Le [`ChatViewModel`](../../src/PostIt/PostIt/ViewModels/Chat/ChatViewModel.cs)
-ouvre le hub avec le jeton d'accès PostIt, tente un renouvellement silencieux
-du jeton, et active la reconnexion automatique. Après reconnexion, il rejoint
-à nouveau le salon sélectionné, car la connexion SignalR précédente et ses
-groupes ne sont plus actifs. Les callbacks mettent à jour les collections sur
-le thread UI d'Avalonia.
-
-### Événement métier `push`
-
-En plus des événements du chat, `YavscMessageSender` utilise le même contexte
-SignalR pour émettre `push` avec le topic et une charge utile sérialisée. Ce
-nom d'événement est distinct de `notifyUser` et `notifyRoom`. Aucun
-gestionnaire `push` n'est présent dans le client PostIt actuel : les annonces
-métier persistées sont visibles dans PostIt lors du prochain chargement ou
-rafraîchissement HTTP.
-
-## 5. Points d'attention pour les évolutions
-
-- Conserver les règles d'audience alignées entre l'API et le site Web ; en
-  particulier, appliquer un filtrage `Target` côté Web avant d'exposer les
-  avis dans le layout.
-- Ne pas confondre masquage utilisateur (`DismissClicked`) et suppression
-  globale de la notification : le masquage API est par utilisateur.
-- Les sessions anonymes du site Web et PostIt n'ont pas le même comportement :
-  le site Web conserve le masquage en session, tandis que PostIt ne le garde
-  que dans la liste affichée jusqu'au prochain rechargement.
-- Ajouter un nouveau type de cible ou un nouvel événement temps réel implique
-  d'examiner séparément son filtrage, son transport et les clients qui
-  l'écoutent.
-- Les références à GCM et le nom historique de `YavscMessageSender` ne
-  signifient pas que PostIt reçoit une notification native hors ligne : le
-  chemin observé ici est l'e-mail, l'événement SignalR temps réel et la
-  notification persistée récupérée par HTTP.
-
-## Références d'implémentation
-
-- [`Notification`](../../src/Yavsc.Abstract/Messaging/Notification.cs)
-- [`NotificationsApiController`](../../src/Yavsc.Api/Controllers/Administration/NotificationsApiController.cs)
-- [`DismissClicksApiController`](../../src/Yavsc.Api/Controllers/Administration/DismissClicksApiController.cs)
-- [`NotificationsController`](../../src/Yavsc.Org/Controllers/Communicating/NotificationsController.cs)
-- [`HomeController`](../../src/Yavsc.Org/Controllers/HomeController.cs)
-- [`YavscMessageSender`](../../src/Yavsc.Server/Services/YavscMessageSender.cs)
-- [`ChatHub`](../../src/Yavsc.Server/Hubs/ChatHub.cs)
-- [`NotificationsApiClient`](../../src/Yavsc.Api.Client/NotificationsApiClient.cs)
-- [`HomePageViewModel`](../../src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs)
-- [`ChatViewModel`](../../src/PostIt/PostIt/ViewModels/Chat/ChatViewModel.cs)
diff --git a/doc/testing.md b/doc/testing.md
index 7b5de174f..8b5e8eff1 100644
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -97,59 +97,6 @@ decodage authentifie du replay. Aucun FFmpeg n'est requis par ces tests ni
 par l'application (le fichier d'entree peut provenir de n'importe quelle source).
 Les tests materiels camera/microphone Windows/Linux restent manuels.
 
-### Rotation de la capture Android
-
-Le calcul capteur/ecran/camera avant et les quatre transformations de texture
-sont couverts sans appareil :
-
-```bash
-dotnet test --project src/PostIt/PostIt.Tests/PostIt.Tests.csproj \
-  --filter-class '*CameraFrameOrientationTests' --filter-class '*CameraFrameClockTests'
-```
-
-Un test Android supplementaire verifie le chemin OpenGL et l'encodeur reels,
-sans ouvrir la camera, sans microphone et sans contacter l'API :
-
-```bash
-dotnet build src/PostIt/PostIt.Android/PostIt.Android.csproj -c Debug \
-  -p:EmbedAssembliesIntoApk=true
-adb install -r -t src/PostIt/PostIt.Android/bin/Debug/net10.0-android/fr.pschneider.postit-Signed.apk
-adb shell am start -n fr.pschneider.postit/fr.pschneider.postit.CameraFrameRotationTestActivity
-adb shell run-as fr.pschneider.postit cat files/camera-rotation-test-result.txt
-```
-
-Attendre la fin du test : `RUNNING` doit devenir `PASS`. Il encode quatre
-quadrants colores en MPEG-TS pour 0, 90, 180 et 270 degres, decode une image et
-verifie les dimensions (640x480 ou 480x640) et les couleurs aux quatre positions.
-La tolerance de chaque composante RGB est de 40 pour tenir compte de H.264.
-Une erreur de rendu, d'encodage, de decodage ou de comparaison produit `FAIL`
-avec l'exception. Cette activite est exclue des builds Release.
-
-Le test synthetique ne couvre pas l'horloge Camera2 ni sa synchronisation avec
-le microphone. Avec l'accord de la personne utilisant le telephone, lancer
-aussi le test local reel (camera et microphone actifs, aucun envoi a l'API) :
-
-```bash
-adb shell am start -n fr.pschneider.postit/fr.pschneider.postit.PodcastCaptureTestActivity --es microphone true
-adb shell run-as fr.pschneider.postit cat files/podcast-capture-test-result.txt
-```
-
-Attendre `PASS` : au moins trois segments, 8 a 16 secondes capturees,
-pistes H.264 et AAC presentes, et progression des segments en arriere-plan.
-Ce test detecte notamment les captures de zero seconde dues au decalage entre
-l'horloge Camera2 et celle de MediaRecorder. Les fichiers restent dans le
-repertoire prive indique par le resultat pour verification locale.
-Le resultat inclut les angles capteur/ecran et la premiere matrice
-SurfaceTexture recue. Les tests unitaires couvrent notamment la matrice
-reelle `[0,-1,0,0,-1,0,0,0,0,0,1,0,1,1,0,1]` : pour un capteur a 90 degres
-et un ecran a 0, elle porte deja la rotation et ne doit pas recevoir 90 degres
-supplementaires. Le test synthetique seul ne detecte pas cette double rotation.
-
-Verifier aussi manuellement les cameras avant/arriere en portrait et paysage,
-le son, le direct et le replay, et la poursuite de l'emission en arriere-plan.
-L'orientation est fixee au demarrage d'une emission ; tourner le telephone
-pendant l'emission ne reconfigure pas le format encode.
-
 ## Quand ne PAS écrire de test
 
 Un test qui ne détecte rien n'est pas un test. Si l'invariant
diff --git a/src/PostIt/Directory.Packages.props b/src/PostIt/Directory.Packages.props
index ae6708992..a6a656368 100644
--- a/src/PostIt/Directory.Packages.props
+++ b/src/PostIt/Directory.Packages.props
@@ -19,7 +19,7 @@
     <PackageVersion Include="DirectShowLib" Version="1.0.0" />
     <PackageVersion Include="LibVLCSharp.Avalonia" Version="3.10.2" />
     <PackageVersion Include="LibVLCSharp" Version="3.10.2" />
-    <PackageVersion Include="VideoLAN.LibVLC.Android" Version="3.7.0-beta" />
+    <PackageVersion Include="VideoLAN.LibVLC.Android" Version="3.6.5" />
     <PackageVersion Include="Live.Avalonia" Version="1.4.2" />
     <PackageVersion Include="Mapsui" Version="5.1.0" />
     <PackageVersion Include="Mapsui.Avalonia12" Version="5.1.0" />
diff --git a/src/PostIt/PostIt.Android/PostIt.Android.csproj b/src/PostIt/PostIt.Android/PostIt.Android.csproj
index 5b7f4f968..0923e8a12 100644
--- a/src/PostIt/PostIt.Android/PostIt.Android.csproj
+++ b/src/PostIt/PostIt.Android/PostIt.Android.csproj
@@ -31,7 +31,6 @@
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Debug'">
     <Compile Include="..\PostIt.Tests\AndroidPodcastCaptureTestActivity.cs" Link="Tests\AndroidPodcastCaptureTestActivity.cs" />
-    <Compile Include="..\PostIt.Tests\AndroidCameraFrameRotationTestActivity.cs" Link="Tests\AndroidCameraFrameRotationTestActivity.cs" />
   </ItemGroup>
   <!-- This is an Avalonia app, not a MAUI app: exclude the .NET MAUI VS Code
        extension's injected HotReload agent (references Microsoft.Maui.*).
diff --git a/src/PostIt/PostIt.Android/Services/AndroidCameraFrameRotator.cs b/src/PostIt/PostIt.Android/Services/AndroidCameraFrameRotator.cs
deleted file mode 100644
index b45b5ba21..000000000
--- a/src/PostIt/PostIt.Android/Services/AndroidCameraFrameRotator.cs
+++ /dev/null
@@ -1,308 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Android.Graphics;
-using Android.Opengl;
-using Android.OS;
-using Android.Views;
-using Java.Nio;
-
-namespace PostIt.Android.Services;
-
-internal sealed class AndroidCameraFrameRotator : IDisposable
-{
-    private const int ExternalTexture = 0x8D65;
-    private const int RecordableAndroid = 0x3142;
-    private const string VertexShader = """
-        attribute vec2 position;
-        attribute vec2 textureCoordinate;
-        uniform mat4 textureMatrix;
-        varying vec2 uv;
-        void main() {
-            gl_Position = vec4(position, 0.0, 1.0);
-            uv = (textureMatrix * vec4(textureCoordinate, 0.0, 1.0)).xy;
-        }
-        """;
-    private const string FragmentShader = """
-        #extension GL_OES_EGL_image_external : require
-        precision mediump float;
-        uniform samplerExternalOES cameraTexture;
-        varying vec2 uv;
-        void main() {
-            gl_FragColor = texture2D(cameraTexture, uv);
-        }
-        """;
-
-    private readonly HandlerThread _thread = new("PostIt.CameraRotation");
-    private readonly Handler _handler;
-    private readonly Action<Exception> _failed;
-    private readonly float[] _textureMatrix = new float[16];
-    private readonly CameraFrameClock _clock = new();
-    private EGLDisplay? _display;
-    private EGLContext? _context;
-    private EGLSurface? _window;
-    private SurfaceTexture? _texture;
-    private FrameListener? _listener;
-    private Surface? _cameraSurface;
-    private FloatBuffer? _vertices;
-    private FloatBuffer? _coordinates;
-    private int _program;
-    private int _textureId;
-    private int _matrixLocation;
-    private bool _rendering;
-    private bool _disposed;
-    private int _rotation;
-    private int? _remainingRotation;
-    internal string? FirstTextureTransform { get; private set; }
-
-    internal Surface CameraSurface => _cameraSurface
-        ?? throw new InvalidOperationException("Surface de rotation camera indisponible.");
-
-    private AndroidCameraFrameRotator(Action<Exception> failed)
-    {
-        _failed = failed;
-        _thread.Start();
-        _handler = new Handler(_thread.Looper!);
-    }
-
-    internal static async Task<AndroidCameraFrameRotator> CreateAsync(
-        Surface encoderSurface, int width, int height, int rotation, Action<Exception> failed)
-    {
-        var rotator = new AndroidCameraFrameRotator(failed);
-        try
-        {
-            await rotator.InvokeAsync(() => rotator.Initialize(encoderSurface, width, height, rotation));
-            return rotator;
-        }
-        catch
-        {
-            rotator.Dispose();
-            throw;
-        }
-    }
-
-    private void Initialize(Surface encoderSurface, int width, int height, int rotation)
-    {
-        _rotation = rotation;
-        _display = EGL14.EglGetDisplay(EGL14.EglDefaultDisplay);
-        if (_display is null || _display.Equals(EGL14.EglNoDisplay))
-            throw EglError("Obtention de l'affichage EGL");
-        if (!EGL14.EglInitialize(_display, new int[2], 0, new int[2], 0))
-            throw EglError("Initialisation EGL");
-        int[] attributes =
-        [
-            EGL14.EglRedSize, 8, EGL14.EglGreenSize, 8, EGL14.EglBlueSize, 8,
-            EGL14.EglRenderableType, EGL14.EglOpenglEs2Bit,
-            EGL14.EglSurfaceType, EGL14.EglWindowBit, RecordableAndroid, 1, EGL14.EglNone
-        ];
-        var configs = new EGLConfig[1];
-        var count = new int[1];
-        if (!EGL14.EglChooseConfig(_display, attributes, 0, configs, 0, 1, count, 0) || count[0] == 0)
-            throw EglError("Configuration EGL pour l'encodeur");
-        _context = EGL14.EglCreateContext(_display, configs[0], EGL14.EglNoContext,
-            [EGL14.EglContextClientVersion, 2, EGL14.EglNone], 0);
-        if (_context is null || _context.Equals(EGL14.EglNoContext))
-            throw EglError("Creation du contexte EGL");
-        _window = EGL14.EglCreateWindowSurface(_display, configs[0], encoderSurface, [EGL14.EglNone], 0);
-        if (_window is null || _window.Equals(EGL14.EglNoSurface))
-            throw EglError("Creation de la surface EGL");
-        if (!EGL14.EglMakeCurrent(_display, _window, _window, _context))
-            throw EglError("Activation du contexte EGL");
-
-        _program = CreateProgram();
-        var ids = new int[1];
-        GLES20.GlGenTextures(1, ids, 0);
-        _textureId = ids[0];
-        GLES20.GlBindTexture(ExternalTexture, _textureId);
-        GLES20.GlTexParameteri(ExternalTexture, GLES20.GlTextureMinFilter, GLES20.GlLinear);
-        GLES20.GlTexParameteri(ExternalTexture, GLES20.GlTextureMagFilter, GLES20.GlLinear);
-        GLES20.GlTexParameteri(ExternalTexture, GLES20.GlTextureWrapS, GLES20.GlClampToEdge);
-        GLES20.GlTexParameteri(ExternalTexture, GLES20.GlTextureWrapT, GLES20.GlClampToEdge);
-        _vertices = CreateBuffer([-1, -1, 1, -1, -1, 1, 1, 1]);
-        _coordinates = CreateBuffer(CameraFrameOrientation.GetTextureCoordinates(0));
-        GLES20.GlUseProgram(_program);
-        BindAttribute("position", _vertices);
-        BindAttribute("textureCoordinate", _coordinates);
-        _matrixLocation = GLES20.GlGetUniformLocation(_program, "textureMatrix");
-        GLES20.GlUniform1i(GLES20.GlGetUniformLocation(_program, "cameraTexture"), 0);
-        GLES20.GlViewport(0, 0, rotation is 90 or 270 ? height : width, rotation is 90 or 270 ? width : height);
-        CheckGl();
-
-        _texture = new SurfaceTexture(_textureId);
-        _texture.SetDefaultBufferSize(width, height);
-        _listener = new FrameListener(this);
-        _texture.SetOnFrameAvailableListener(_listener, _handler);
-        _cameraSurface = new Surface(_texture);
-    }
-
-    internal Task StartAsync() => InvokeAsync(() => _rendering = true);
-
-    private void DrawFrame(SurfaceTexture texture)
-    {
-        if (!_rendering) return;
-        try
-        {
-            texture.UpdateTexImage();
-            var presentationTime = _clock.GetPresentationTime(texture.Timestamp, Java.Lang.JavaSystem.NanoTime());
-            if (presentationTime is null) return;
-            texture.GetTransformMatrix(_textureMatrix);
-            var remainingRotation = CameraFrameOrientation.GetRemainingRotation(_rotation, _textureMatrix);
-            if (_remainingRotation != remainingRotation)
-            {
-                _remainingRotation = remainingRotation;
-                FirstTextureTransform = string.Join(", ", _textureMatrix);
-                _coordinates!.Position(0);
-                _coordinates.Put(CameraFrameOrientation.GetTextureCoordinates(remainingRotation));
-                _coordinates.Position(0);
-                global::Android.Util.Log.Info("PostIt.Podcast",
-                    $"Camera texture transform: [{FirstTextureTransform}], remaining rotation={remainingRotation}");
-            }
-            GLES20.GlUniformMatrix4fv(_matrixLocation, 1, false, _textureMatrix, 0);
-            GLES20.GlDrawArrays(GLES20.GlTriangleStrip, 0, 4);
-            CheckGl();
-            if (!EGLExt.EglPresentationTimeANDROID(_display, _window, presentationTime.Value))
-                throw EglError("Horodatage de l'image camera");
-            if (!EGL14.EglSwapBuffers(_display, _window))
-                throw EglError("Envoi de l'image a l'encodeur");
-        }
-        catch (Exception ex)
-        {
-            _rendering = false;
-            _failed(new InvalidOperationException("Rotation de la capture Android impossible.", ex));
-        }
-    }
-
-    private Task InvokeAsync(Action action)
-    {
-        var completion = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        if (!_handler.Post(() =>
-        {
-            try { action(); completion.SetResult(); }
-            catch (Exception ex) { completion.SetException(ex); }
-        }))
-            completion.SetException(new InvalidOperationException("Le thread de rotation camera est arrete."));
-        return completion.Task;
-    }
-
-    private static FloatBuffer CreateBuffer(float[] values)
-    {
-        using var bytes = ByteBuffer.AllocateDirect(values.Length * sizeof(float))
-            ?? throw new InvalidOperationException("Allocation du tampon OpenGL impossible.");
-        bytes.Order(ByteOrder.NativeOrder()!);
-        var buffer = bytes.AsFloatBuffer()
-            ?? throw new InvalidOperationException("Creation du tampon OpenGL impossible.");
-        buffer.Put(values);
-        buffer.Position(0);
-        return buffer;
-    }
-
-    private void BindAttribute(string name, FloatBuffer buffer)
-    {
-        var location = GLES20.GlGetAttribLocation(_program, name);
-        GLES20.GlEnableVertexAttribArray(location);
-        GLES20.GlVertexAttribPointer(location, 2, GLES20.GlFloat, false, 0, buffer);
-    }
-
-    private static int CreateShader(int type, string source)
-    {
-        var shader = GLES20.GlCreateShader(type);
-        GLES20.GlShaderSource(shader, source);
-        GLES20.GlCompileShader(shader);
-        var status = new int[1];
-        GLES20.GlGetShaderiv(shader, GLES20.GlCompileStatus, status, 0);
-        if (status[0] != 0) return shader;
-        var error = GLES20.GlGetShaderInfoLog(shader);
-        GLES20.GlDeleteShader(shader);
-        throw new InvalidOperationException($"Compilation du shader camera impossible : {error}");
-    }
-
-    private static int CreateProgram()
-    {
-        var vertex = CreateShader(GLES20.GlVertexShader, VertexShader);
-        var fragment = 0;
-        var program = 0;
-        try
-        {
-            fragment = CreateShader(GLES20.GlFragmentShader, FragmentShader);
-            program = GLES20.GlCreateProgram();
-            GLES20.GlAttachShader(program, vertex);
-            GLES20.GlAttachShader(program, fragment);
-            GLES20.GlLinkProgram(program);
-            var status = new int[1];
-            GLES20.GlGetProgramiv(program, GLES20.GlLinkStatus, status, 0);
-            if (status[0] == 0)
-                throw new InvalidOperationException($"Edition du programme camera impossible : {GLES20.GlGetProgramInfoLog(program)}");
-            return program;
-        }
-        catch
-        {
-            if (program != 0) GLES20.GlDeleteProgram(program);
-            throw;
-        }
-        finally
-        {
-            GLES20.GlDeleteShader(vertex);
-            if (fragment != 0) GLES20.GlDeleteShader(fragment);
-        }
-    }
-
-    private static void CheckGl()
-    {
-        var error = GLES20.GlGetError();
-        if (error != GLES20.GlNoError)
-            throw new InvalidOperationException($"Erreur OpenGL de capture : 0x{error:X}.");
-    }
-
-    private static InvalidOperationException EglError(string operation)
-        => new($"{operation} impossible : EGL 0x{EGL14.EglGetError():X}.");
-
-    public void Dispose()
-    {
-        if (_disposed) return;
-        _disposed = true;
-        try { InvokeAsync(Release).GetAwaiter().GetResult(); }
-        finally
-        {
-            _thread.QuitSafely();
-            _thread.Join();
-            _handler.Dispose();
-            _thread.Dispose();
-        }
-    }
-
-    private void Release()
-    {
-        _rendering = false;
-        _texture?.SetOnFrameAvailableListener(null);
-        _cameraSurface?.Release();
-        _cameraSurface?.Dispose();
-        _texture?.Release();
-        _texture?.Dispose();
-        _listener?.Dispose();
-        if (_program != 0) GLES20.GlDeleteProgram(_program);
-        if (_textureId != 0) GLES20.GlDeleteTextures(1, [_textureId], 0);
-        _vertices?.Dispose();
-        _coordinates?.Dispose();
-        if (_display is not null && !_display.Equals(EGL14.EglNoDisplay))
-        {
-            EGL14.EglMakeCurrent(_display, EGL14.EglNoSurface, EGL14.EglNoSurface, EGL14.EglNoContext);
-            if (_window is not null && !_window.Equals(EGL14.EglNoSurface))
-                EGL14.EglDestroySurface(_display, _window);
-            if (_context is not null && !_context.Equals(EGL14.EglNoContext))
-                EGL14.EglDestroyContext(_display, _context);
-            EGL14.EglReleaseThread();
-            EGL14.EglTerminate(_display);
-        }
-        _window?.Dispose();
-        _context?.Dispose();
-        _display?.Dispose();
-    }
-
-    private sealed class FrameListener(AndroidCameraFrameRotator owner)
-        : Java.Lang.Object, SurfaceTexture.IOnFrameAvailableListener
-    {
-        public void OnFrameAvailable(SurfaceTexture? texture)
-        {
-            if (texture is not null) owner.DrawFrame(texture);
-        }
-    }
-}
diff --git a/src/PostIt/PostIt.Android/Services/AndroidPodcastCapture.cs b/src/PostIt/PostIt.Android/Services/AndroidPodcastCapture.cs
index 39f754e73..224bdd4fd 100644
--- a/src/PostIt/PostIt.Android/Services/AndroidPodcastCapture.cs
+++ b/src/PostIt/PostIt.Android/Services/AndroidPodcastCapture.cs
@@ -26,7 +26,6 @@ internal sealed class AndroidPodcastCapture : IPodcastCapture
     private CameraDevice? _camera;
     private CameraCaptureSession? _session;
     private MediaRecorder? _recorder;
-    private AndroidCameraFrameRotator? _rotator;
     private Surface? _surface;
     private ParcelFileDescriptor? _readPipe;
     private ParcelFileDescriptor? _writePipe;
@@ -37,8 +36,6 @@ internal sealed class AndroidPodcastCapture : IPodcastCapture
     private bool _started;
     private bool _disposed;
     public Task Completion => _completion.Task;
-    internal string OrientationDiagnostics { get; private set; } = "";
-    internal string? TextureTransform => _rotator?.FirstTextureTransform;
 
     private AndroidPodcastCapture(PodcastCaptureService service) => _service = service;
 
@@ -106,30 +103,6 @@ internal sealed class AndroidPodcastCapture : IPodcastCapture
         var size = sizes.Where(s => s.Width <= 640 && s.Height <= 480)
             .OrderByDescending(s => s.Width * s.Height).FirstOrDefault()
             ?? throw new InvalidOperationException("La camera ne propose aucun format jusqu'a 480p.");
-        using var sensor = characteristics.Get(CameraCharacteristics.SensorOrientation) as Java.Lang.Integer
-            ?? throw new InvalidOperationException("Orientation du capteur camera indisponible.");
-        using var facing = characteristics.Get(CameraCharacteristics.LensFacing) as Java.Lang.Integer
-            ?? throw new InvalidOperationException("Position du capteur camera indisponible.");
-        var activity = MainActivity.Current ?? throw new InvalidOperationException("Activite Android indisponible.");
-#pragma warning disable CS0618, CA1422
-        var display = OperatingSystem.IsAndroidVersionAtLeast(30)
-            ? activity.Display : activity.WindowManager?.DefaultDisplay;
-#pragma warning restore CS0618, CA1422
-        var displayRotation = display?.Rotation
-            ?? throw new InvalidOperationException("Orientation de l'ecran Android indisponible.");
-        var displayDegrees = displayRotation switch
-        {
-            SurfaceOrientation.Rotation0 => 0,
-            SurfaceOrientation.Rotation90 => 90,
-            SurfaceOrientation.Rotation180 => 180,
-            SurfaceOrientation.Rotation270 => 270,
-            _ => throw new InvalidOperationException($"Rotation d'ecran Android inconnue : {displayRotation}.")
-        };
-        var rotation = CameraFrameOrientation.GetRotation(sensor.IntValue(), displayDegrees,
-            facing.IntValue() == (int)LensFacing.Front);
-        global::Android.Util.Log.Info("PostIt.Podcast",
-            $"Camera orientation: sensor={sensor.IntValue()}, display={displayDegrees}, facing={facing.IntValue()}, rotation={rotation}");
-        OrientationDiagnostics = $"sensor={sensor.IntValue()}, display={displayDegrees}, facing={facing.IntValue()}, rotation={rotation}";
 #pragma warning disable CS0618
         _recorder = OperatingSystem.IsAndroidVersionAtLeast(31)
             ? new MediaRecorder(_service) : new MediaRecorder();
@@ -138,8 +111,7 @@ internal sealed class AndroidPodcastCapture : IPodcastCapture
         if (microphone) _recorder.SetAudioSource(AudioSource.Mic);
         _recorder.SetVideoSource(VideoSource.Surface);
         _recorder.SetOutputFormat(OutputFormat.Mpeg2Ts);
-        _recorder.SetVideoSize(rotation is 90 or 270 ? size.Height : size.Width,
-            rotation is 90 or 270 ? size.Width : size.Height);
+        _recorder.SetVideoSize(size.Width, size.Height);
         _recorder.SetVideoFrameRate(30);
         _recorder.SetVideoEncodingBitRate(1200000);
         _recorder.SetVideoEncoder(VideoEncoder.H264);
@@ -159,23 +131,20 @@ internal sealed class AndroidPodcastCapture : IPodcastCapture
         ct.ThrowIfCancellationRequested();
         if (_stopRequested) throw new System.OperationCanceledException("Demarrage de la capture annule.");
         _surface = _recorder.Surface ?? throw new InvalidOperationException("Surface encodeur indisponible.");
-        _rotator = await AndroidCameraFrameRotator.CreateAsync(_surface, size.Width, size.Height, rotation, Fail);
-        ct.ThrowIfCancellationRequested();
-        if (_stopRequested) throw new System.OperationCanceledException("Demarrage de la capture annule.");
-        var cameraSurface = _rotator.CameraSurface;
         var opened = new TaskCompletionSource<CameraDevice>(TaskCreationOptions.RunContinuationsAsynchronously);
         manager.OpenCamera(cameraId, new DeviceCallback(this, opened), _handler);
         _camera = await opened.Task.WaitAsync(TimeSpan.FromSeconds(10), ct);
         var configured = new TaskCompletionSource<CameraCaptureSession>(TaskCreationOptions.RunContinuationsAsynchronously);
 #pragma warning disable CS0618, CA1422
-        _camera.CreateCaptureSession(new List<Surface> { cameraSurface }, new SessionCallback(this, configured), _handler);
+        _camera.CreateCaptureSession(new List<Surface> { _surface }, new SessionCallback(this, configured), _handler);
 #pragma warning restore CS0618, CA1422
         _session = await configured.Task.WaitAsync(TimeSpan.FromSeconds(10), ct);
         ct.ThrowIfCancellationRequested();
         if (_stopRequested) throw new System.OperationCanceledException("Demarrage de la capture annule.");
         using var request = _camera.CreateCaptureRequest(CameraTemplate.Record);
-        request.AddTarget(cameraSurface);
+        request.AddTarget(_surface);
         using var built = request.Build();
+        _session.SetRepeatingRequest(built, null, _handler);
         var handle = new SafeFileHandle((IntPtr)_readPipe.Fd, ownsHandle: false);
         var stream = new FileStream(handle, FileAccess.Read);
         _pump = Task.Run(async () =>
@@ -200,8 +169,6 @@ internal sealed class AndroidPodcastCapture : IPodcastCapture
         });
         await Task.Run(_recorder.Start, ct);
         _started = true;
-        await _rotator.StartAsync();
-        _session.SetRepeatingRequest(built, null, _handler);
         _writePipe.Close();
         _writePipe.Dispose();
         _writePipe = null;
@@ -294,11 +261,7 @@ internal sealed class AndroidPodcastCapture : IPodcastCapture
 
     private void StopNative()
     {
-        try
-        {
-            // Keep frames flowing until MediaRecorder has drained its encoder.
-            if (_started) _recorder?.Stop();
-        }
+        try { if (_started) _recorder?.Stop(); }
         catch (Java.Lang.RuntimeException ex)
         {
             _failure = ex;
@@ -313,8 +276,6 @@ internal sealed class AndroidPodcastCapture : IPodcastCapture
             _camera?.Close();
             _camera?.Dispose();
             _camera = null;
-            _rotator?.Dispose();
-            _rotator = null;
             if (_recorder is not null)
             {
                 _recorder.Error -= OnRecorderError;
diff --git a/src/PostIt/PostIt.Android/Services/CameraFrameClock.cs b/src/PostIt/PostIt.Android/Services/CameraFrameClock.cs
deleted file mode 100644
index 936ce432a..000000000
--- a/src/PostIt/PostIt.Android/Services/CameraFrameClock.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-namespace PostIt.Android.Services;
-
-internal sealed class CameraFrameClock
-{
-    private long? _offset;
-    private long? _previousTimestamp;
-
-    internal long? GetPresentationTime(long cameraTimestamp, long monotonicNow)
-    {
-        if (_previousTimestamp is { } previous)
-        {
-            if (cameraTimestamp == previous) return null;
-            if (cameraTimestamp < previous)
-                throw new InvalidOperationException("Les horodatages de la camera Android ont recule.");
-        }
-        // Camera2 may use elapsed realtime (including suspend), whereas MediaRecorder
-        // and its microphone use monotonic time. Preserve frame intervals, not that epoch.
-        _offset ??= monotonicNow - cameraTimestamp;
-        _previousTimestamp = cameraTimestamp;
-        return checked(cameraTimestamp + _offset.Value);
-    }
-}
diff --git a/src/PostIt/PostIt.Android/Services/CameraFrameOrientation.cs b/src/PostIt/PostIt.Android/Services/CameraFrameOrientation.cs
deleted file mode 100644
index c176899c0..000000000
--- a/src/PostIt/PostIt.Android/Services/CameraFrameOrientation.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-
-namespace PostIt.Android.Services;
-
-internal static class CameraFrameOrientation
-{
-    internal static int GetRotation(int sensorDegrees, int displayDegrees, bool frontFacing)
-    {
-        Validate(sensorDegrees);
-        Validate(displayDegrees);
-        return (sensorDegrees + (frontFacing ? displayDegrees : -displayDegrees) + 360) % 360;
-    }
-
-    internal static float[] GetTextureCoordinates(int clockwiseDegrees)
-    {
-        Validate(clockwiseDegrees);
-        float[] corners = [0, 0, 1, 0, 0, 1, 1, 1];
-        for (var i = 0; i < corners.Length; i += 2)
-        {
-            var x = corners[i];
-            var y = corners[i + 1];
-            (corners[i], corners[i + 1]) = clockwiseDegrees switch
-            {
-                90 => (1 - y, x),
-                180 => (1 - x, 1 - y),
-                270 => (y, 1 - x),
-                _ => (x, y)
-            };
-        }
-        return corners;
-    }
-
-    internal static int GetRemainingRotation(int clockwiseDegrees, float[] textureMatrix)
-    {
-        Validate(clockwiseDegrees);
-        if (textureMatrix.Length != 16)
-            throw new ArgumentException("A SurfaceTexture transform must contain 16 elements.", nameof(textureMatrix));
-        // SurfaceTexture's usual Y flip changes the sign of the first column's Y.
-        // Camera2 can also put the sensor rotation in this matrix; don't apply it twice.
-        var angle = Math.Atan2(-textureMatrix[1], textureMatrix[0]) * 180 / Math.PI;
-        if (!double.IsFinite(angle) || (textureMatrix[0] == 0 && textureMatrix[1] == 0))
-            throw new ArgumentException("Invalid SurfaceTexture orientation.", nameof(textureMatrix));
-        var quarterTurns = (int)Math.Round(angle / 90);
-        if (Math.Abs(angle - quarterTurns * 90) > 0.01)
-            throw new ArgumentException("SurfaceTexture orientation is not a quarter turn.", nameof(textureMatrix));
-        var producerRotation = (quarterTurns * 90 + 360) % 360;
-        return (clockwiseDegrees - producerRotation + 360) % 360;
-    }
-
-    private static void Validate(int degrees)
-    {
-        if (degrees is not (0 or 90 or 180 or 270))
-            throw new ArgumentOutOfRangeException(nameof(degrees), degrees, "Rotation must be 0, 90, 180 or 270 degrees.");
-    }
-}
diff --git a/src/PostIt/PostIt.Android/proguard-rules.pro b/src/PostIt/PostIt.Android/proguard-rules.pro
deleted file mode 100644
index 210830083..000000000
--- a/src/PostIt/PostIt.Android/proguard-rules.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-# Keep the LibVLC Android classes and JNI/native bindings intact in Release builds.
-# R8/ProGuard otherwise can strip or rename the Java-side entry points that load
-# the native libvlc and libc++_shared libraries bundled by VideoLAN.LibVLC.Android.
--keep class org.videolan.libvlc.** { *; }
--keep class org.videolan.libvlc.** { native *; }
--keep class org.videolan.medialibrary.** { *; }
--keepattributes *Annotation*
--dontwarn org.videolan.libvlc.**
--dontwarn org.videolan.medialibrary.**
diff --git a/src/PostIt/PostIt.Tests/AndroidCameraFrameRotationTestActivity.cs b/src/PostIt/PostIt.Tests/AndroidCameraFrameRotationTestActivity.cs
deleted file mode 100644
index 2de366408..000000000
--- a/src/PostIt/PostIt.Tests/AndroidCameraFrameRotationTestActivity.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-#if ANDROID
-using System;
-using System.IO;
-using System.Runtime.Versioning;
-using System.Threading;
-using System.Threading.Tasks;
-using Android.App;
-using Android.Graphics;
-using Android.Media;
-using Android.OS;
-using PostIt.Android.Services;
-using Path = System.IO.Path;
-
-namespace PostIt.Tests;
-
-/// <summary>Debug-only synthetic encoder test; never opens the camera or contacts the API.</summary>
-[Activity(Name = "fr.pschneider.postit.CameraFrameRotationTestActivity", Exported = true)]
-[SupportedOSPlatform("android26.0")]
-public sealed class AndroidCameraFrameRotationTestActivity : Activity
-{
-    protected override async void OnCreate(Bundle? state)
-    {
-        base.OnCreate(state);
-        var resultPath = Path.Combine(FilesDir!.AbsolutePath, "camera-rotation-test-result.txt");
-        File.WriteAllText(resultPath, "RUNNING");
-        try
-        {
-            foreach (var rotation in new[] { 0, 90, 180, 270 })
-                await VerifyRotationAsync(rotation);
-            File.WriteAllText(resultPath, "PASS\nrotations=0,90,180,270\nformat=MPEG-TS\nsource=synthetic");
-        }
-        catch (Exception ex)
-        {
-            File.WriteAllText(resultPath, $"FAIL\n{ex}");
-        }
-        finally { Finish(); }
-    }
-
-    private async Task VerifyRotationAsync(int rotation)
-    {
-        const int width = 640;
-        const int height = 480;
-        var outputWidth = rotation is 90 or 270 ? height : width;
-        var outputHeight = rotation is 90 or 270 ? width : height;
-        var path = Path.Combine(FilesDir!.AbsolutePath, $"camera-rotation-{rotation}.ts");
-        void Stage(string stage) => File.WriteAllText(
-            Path.Combine(FilesDir.AbsolutePath, "camera-rotation-test-result.txt"), $"RUNNING\nrotation={rotation}\nstage={stage}");
-        Stage("prepare");
-#pragma warning disable CS0618
-        using var recorder = OperatingSystem.IsAndroidVersionAtLeast(31)
-            ? new MediaRecorder(this) : new MediaRecorder();
-#pragma warning restore CS0618
-        recorder.SetVideoSource(VideoSource.Surface);
-        recorder.SetOutputFormat(OutputFormat.Mpeg2Ts);
-        recorder.SetVideoSize(outputWidth, outputHeight);
-        recorder.SetVideoFrameRate(30);
-        recorder.SetVideoEncodingBitRate(1200000);
-        recorder.SetVideoEncoder(VideoEncoder.H264);
-        recorder.SetOutputFile(path);
-        recorder.Prepare();
-        using var encoderSurface = recorder.Surface
-            ?? throw new InvalidOperationException("Encoder surface unavailable.");
-        Exception? failure = null;
-        var stopping = 0;
-        Stage("initialize EGL");
-        using (var rotator = await AndroidCameraFrameRotator.CreateAsync(
-            encoderSurface, width, height, rotation, error =>
-            {
-                if (Volatile.Read(ref stopping) != 0) return;
-                failure = error;
-                File.WriteAllText(Path.Combine(FilesDir.AbsolutePath, "camera-rotation-test-result.txt"), $"FAIL\n{error}");
-            }))
-        {
-            Stage("start recorder");
-            recorder.Start();
-            Task? stop = null;
-            try
-            {
-                await rotator.StartAsync();
-                using var paint = new Paint();
-                Color[] colors = [Color.Red, Color.Green, Color.Blue, Color.Yellow];
-                Stage("draw frames");
-                for (var frame = 0; frame < 90; frame++)
-                {
-                    if (failure is not null) throw failure;
-                    if (frame == 45)
-                    {
-                        Volatile.Write(ref stopping, 1);
-                        stop = Task.Run(recorder.Stop);
-                    }
-                    if (stop?.IsCompleted == true) break;
-                    var canvas = rotator.CameraSurface.LockCanvas(null)
-                        ?? throw new InvalidOperationException("Synthetic camera canvas unavailable.");
-                    try
-                    {
-                        for (var i = 0; i < colors.Length; i++)
-                        {
-                            paint.Color = colors[i];
-                            var x = i % 2 * width / 2;
-                            var y = i / 2 * height / 2;
-                            canvas.DrawRect(x, y, x + width / 2, y + height / 2, paint);
-                        }
-                    }
-                    finally
-                    {
-                        rotator.CameraSurface.UnlockCanvasAndPost(canvas);
-                        canvas.Dispose();
-                    }
-                    await Task.Delay(34);
-                }
-                if (failure is not null) throw failure;
-                Stage("wait for recorder stop");
-                await (stop ?? throw new InvalidOperationException("Recorder stop was not requested."))
-                    .WaitAsync(TimeSpan.FromSeconds(10));
-            }
-            finally
-            {
-                Stage("dispose EGL");
-                rotator.Dispose();
-            }
-        }
-        Stage("decode");
-        using var retriever = new MediaMetadataRetriever();
-        retriever.SetDataSource(path);
-        using var bitmap = retriever.GetFrameAtTime(0, Option.ClosestSync)
-            ?? throw new InvalidOperationException($"Cannot decode rotation {rotation}.");
-        if (bitmap.Width != outputWidth || bitmap.Height != outputHeight)
-            throw new InvalidOperationException($"Rotation {rotation}: dimensions {bitmap.Width}x{bitmap.Height}, expected {outputWidth}x{outputHeight}.");
-        Color[] expected = rotation switch
-        {
-            90 => [Color.Blue, Color.Red, Color.Yellow, Color.Green],
-            180 => [Color.Yellow, Color.Blue, Color.Green, Color.Red],
-            270 => [Color.Green, Color.Yellow, Color.Red, Color.Blue],
-            _ => [Color.Red, Color.Green, Color.Blue, Color.Yellow]
-        };
-        for (var i = 0; i < expected.Length; i++)
-        {
-            var actual = new Color(bitmap.GetPixel((i % 2 * 2 + 1) * outputWidth / 4,
-                (i / 2 * 2 + 1) * outputHeight / 4));
-            var target = expected[i];
-            if (Math.Abs(actual.R - target.R) > 40 || Math.Abs(actual.G - target.G) > 40 || Math.Abs(actual.B - target.B) > 40)
-                throw new InvalidOperationException($"Rotation {rotation}, quadrant {i}: {actual}, expected {target}.");
-        }
-        File.Delete(path);
-    }
-}
-#endif
diff --git a/src/PostIt/PostIt.Tests/AndroidPodcastCaptureTestActivity.cs b/src/PostIt/PostIt.Tests/AndroidPodcastCaptureTestActivity.cs
index cab2d9f6f..487c986cc 100644
--- a/src/PostIt/PostIt.Tests/AndroidPodcastCaptureTestActivity.cs
+++ b/src/PostIt/PostIt.Tests/AndroidPodcastCaptureTestActivity.cs
@@ -1,13 +1,11 @@
 #if ANDROID
 using System;
 using System.IO;
-using System.Linq;
 using System.Runtime.Versioning;
 using System.Threading;
 using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
-using Android.Media;
 using Android.OS;
 using Avalonia.Threading;
 using PostIt.Android;
@@ -36,7 +34,7 @@ public sealed class AndroidPodcastCaptureTestActivity : Activity
         try
         {
             await RunAsync(result);
-            File.WriteAllText(resultPath, $"PASS\nsegments={result.GetInt("segments")}\ndurationSeconds={result.GetDouble("durationSeconds")}\naudio={result.GetBoolean("audio")}\ndirectory={result.GetString("directory")}\nbackground={result.GetString("background")}\norientation={result.GetString("orientation")}\ntextureTransform={result.GetString("textureTransform")}");
+            File.WriteAllText(resultPath, $"PASS\nsegments={result.GetInt("segments")}\ndirectory={result.GetString("directory")}\nbackground={result.GetString("background")}");
         }
         catch (Exception ex)
         {
@@ -70,11 +68,6 @@ public sealed class AndroidPodcastCaptureTestActivity : Activity
             await Task.Delay(9000);
             var after = SegmentCount(directory);
             if (capture.Completion.IsFaulted) await capture.Completion;
-            if (capture is AndroidPodcastCapture androidCapture)
-            {
-                result.PutString("orientation", androidCapture.OrientationDiagnostics);
-                result.PutString("textureTransform", androidCapture.TextureTransform);
-            }
             if (after <= before) throw new InvalidOperationException($"Capture did not continue in background: {before} -> {after} segments.");
             if (_notificationStop)
             {
@@ -88,25 +81,7 @@ public sealed class AndroidPodcastCaptureTestActivity : Activity
             await capture.Completion.WaitAsync(TimeSpan.FromSeconds(15));
             var segments = HlsCapturePlaylist.Parse(await File.ReadAllTextAsync(Path.Combine(directory, "index.m3u8")));
             if (segments.Count < 3) throw new InvalidOperationException("Insufficient capture segments.");
-            var duration = segments.Sum(segment => segment.DurationSeconds);
-            if (duration < 8 || duration > 16)
-                throw new InvalidOperationException($"Expected 8-16 seconds of capture, got {duration}.");
-            using var extractor = new MediaExtractor();
-            extractor.SetDataSource(Path.Combine(directory, segments[0].FileName));
-            var video = false;
-            var audio = false;
-            for (var track = 0; track < extractor.TrackCount; track++)
-            {
-                using var format = extractor.GetTrackFormat(track);
-                var mime = format.GetString(MediaFormat.KeyMime);
-                video |= mime == "video/avc";
-                audio |= mime == "audio/mp4a-latm";
-            }
-            if (!video || (_microphone && !audio))
-                throw new InvalidOperationException($"Missing capture tracks: H.264={video}, AAC={audio}.");
             result.PutInt("segments", segments.Count);
-            result.PutDouble("durationSeconds", duration);
-            result.PutBoolean("audio", audio);
             result.PutString("directory", directory);
             result.PutString("background", $"segments {before} -> {after}");
         }
diff --git a/src/PostIt/PostIt.Tests/CameraFrameClockTests.cs b/src/PostIt/PostIt.Tests/CameraFrameClockTests.cs
deleted file mode 100644
index 9fbaac067..000000000
--- a/src/PostIt/PostIt.Tests/CameraFrameClockTests.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using PostIt.Android.Services;
-
-namespace PostIt.Tests;
-
-public sealed class CameraFrameClockTests
-{
-    [Theory]
-    [InlineData(4_213_000_000_000L)]
-    [InlineData(0L)]
-    [InlineData(-1_000_000_000L)]
-    public void Aligns_camera_epoch_to_encoder_and_preserves_frame_intervals(long cameraOffset)
-    {
-        var clock = new CameraFrameClock();
-        const long now = 20_000_000_000_000L;
-        var camera = now + cameraOffset;
-        Assert.Equal(now, clock.GetPresentationTime(camera, now));
-        Assert.Equal(now + 33_333_333, clock.GetPresentationTime(camera + 33_333_333, now + 40_000_000));
-        Assert.Equal(now + 100_000_000, clock.GetPresentationTime(camera + 100_000_000, now + 110_000_000));
-    }
-
-    [Fact]
-    public void Does_not_submit_the_same_camera_image_twice()
-    {
-        var clock = new CameraFrameClock();
-        Assert.Equal(100, clock.GetPresentationTime(1000, 100));
-        Assert.Null(clock.GetPresentationTime(1000, 110));
-        Assert.Equal(120, clock.GetPresentationTime(1020, 130));
-    }
-
-    [Fact]
-    public void Reports_a_camera_clock_that_goes_backwards()
-    {
-        var clock = new CameraFrameClock();
-        clock.GetPresentationTime(1000, 100);
-        Assert.Throws<InvalidOperationException>(() => clock.GetPresentationTime(999, 110));
-    }
-}
diff --git a/src/PostIt/PostIt.Tests/CameraFrameOrientationTests.cs b/src/PostIt/PostIt.Tests/CameraFrameOrientationTests.cs
deleted file mode 100644
index c27f9568a..000000000
--- a/src/PostIt/PostIt.Tests/CameraFrameOrientationTests.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using PostIt.Android.Services;
-
-namespace PostIt.Tests;
-
-public sealed class CameraFrameOrientationTests
-{
-    [Theory]
-    [InlineData(90, 0, false, 90)]
-    [InlineData(90, 90, false, 0)]
-    [InlineData(90, 180, false, 270)]
-    [InlineData(90, 270, false, 180)]
-    [InlineData(270, 0, true, 270)]
-    [InlineData(270, 90, true, 0)]
-    [InlineData(270, 180, true, 90)]
-    [InlineData(270, 270, true, 180)]
-    [InlineData(0, 90, false, 270)]
-    [InlineData(180, 270, true, 90)]
-    public void Uses_sensor_display_and_lens_facing(int sensor, int display, bool front, int expected)
-        => Assert.Equal(expected, CameraFrameOrientation.GetRotation(sensor, display, front));
-
-    [Theory]
-    [InlineData(0, new float[] { 0, 0, 1, 0, 0, 1, 1, 1 })]
-    [InlineData(90, new float[] { 1, 0, 1, 1, 0, 0, 0, 1 })]
-    [InlineData(180, new float[] { 1, 1, 0, 1, 1, 0, 0, 0 })]
-    [InlineData(270, new float[] { 0, 1, 0, 0, 1, 1, 1, 0 })]
-    public void Maps_output_corners_to_input_for_clockwise_rotation(int rotation, float[] expected)
-        => Assert.Equal(expected, CameraFrameOrientation.GetTextureCoordinates(rotation));
-
-    [Theory]
-    [InlineData(90, 0, -1, 0)]
-    [InlineData(270, 0, 1, 0)]
-    [InlineData(180, -1, 0, 0)]
-    [InlineData(90, 1, 0, 90)]
-    [InlineData(270, 1, 0, 270)]
-    [InlineData(0, 0, -1, 270)]
-    [InlineData(180, 0, -1, 90)]
-    public void Does_not_repeat_rotation_already_in_surface_texture(
-        int desired, float x, float y, int expected)
-    {
-        float[] matrix = [x, y, 0, 0, y, -x, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1];
-        Assert.Equal(expected, CameraFrameOrientation.GetRemainingRotation(desired, matrix));
-    }
-
-    [Fact]
-    public void Recognizes_the_measured_rear_camera_transform_even_with_cropping()
-    {
-        float[] matrix = [0, -0.9f, 0, 0, -0.8f, 0, 0, 0, 0, 0, 1, 0, 0.9f, 0.95f, 0, 1];
-        Assert.Equal(0, CameraFrameOrientation.GetRemainingRotation(90, matrix));
-    }
-
-    [Theory]
-    [InlineData(-90)]
-    [InlineData(45)]
-    [InlineData(360)]
-    public void Rejects_invalid_angles(int rotation)
-    {
-        Assert.Throws<ArgumentOutOfRangeException>(() => CameraFrameOrientation.GetRotation(rotation, 0, false));
-        Assert.Throws<ArgumentOutOfRangeException>(() => CameraFrameOrientation.GetRotation(90, rotation, false));
-        Assert.Throws<ArgumentOutOfRangeException>(() => CameraFrameOrientation.GetTextureCoordinates(rotation));
-    }
-}
diff --git a/src/PostIt/PostIt.Tests/PostIt.Tests.csproj b/src/PostIt/PostIt.Tests/PostIt.Tests.csproj
index f710f7319..1a732b6b3 100644
--- a/src/PostIt/PostIt.Tests/PostIt.Tests.csproj
+++ b/src/PostIt/PostIt.Tests/PostIt.Tests.csproj
@@ -25,8 +25,5 @@
   <ItemGroup>
     <Using Include="Xunit" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\PostIt.Android\Services\CameraFrameOrientation.cs" Link="Android\CameraFrameOrientation.cs" />
-    <Compile Include="..\PostIt.Android\Services\CameraFrameClock.cs" Link="Android\CameraFrameClock.cs" />
-  </ItemGroup>
+  <ItemGroup></ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/PostIt/PostIt/ViewModels/Layout/SessionStatusViewModel.cs b/src/PostIt/PostIt/ViewModels/Layout/SessionStatusViewModel.cs
index f6bf2282a..d71ed9988 100644
--- a/src/PostIt/PostIt/ViewModels/Layout/SessionStatusViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/Layout/SessionStatusViewModel.cs
@@ -103,7 +103,7 @@ public partial class SessionStatusViewModel : ViewModelBase
             if (profile is null)
                 throw new InvalidOperationException("Le serveur a renvoyé un profil vide.");
             if (version == _accessVersion)
-                IsAdministrator = profile.Roles.Contains(Yavsc.Constants.AdminName, StringComparer.Ordinal);
+                IsAdministrator = profile.Roles.Contains(Yavsc.Constants.AdminGroupName, StringComparer.Ordinal);
         }
         catch (Exception ex)
         {
diff --git a/src/Yavsc.Abstract/Constants.cs b/src/Yavsc.Abstract/Constants.cs
index 3a01af3ca..0d78351ca 100644
--- a/src/Yavsc.Abstract/Constants.cs
+++ b/src/Yavsc.Abstract/Constants.cs
@@ -14,7 +14,6 @@ namespace Yavsc
         public const string CirclePath = "circle";
         public const string CommentsPath = "blogcomments";
         public const string ChatHubPath = "chathub";
-        public const string Administration = "administration";
 
         public static readonly Scope[] SiteScopes = {
             new Scope { Id = "profile", Description = "Your profile informations" },
@@ -53,7 +52,7 @@ namespace Yavsc
         public const string DefaultFactor = "Default";
         public const string MobileAppFactor = "Mobile Application";
         public const string SMSFactor = "SMS";
-        public const string AdminName = "Administrator";
+        public const string AdminGroupName = "Administrator";
         public const string PerformerGroupName = "Performer";
         public const string StarGroupName = "Star";
         public const string StarHunterGroupName = "StarHunter";
diff --git a/src/Yavsc.Api/Controllers/Administration/NotificationsApiController.cs b/src/Yavsc.Api/Controllers/Administration/NotificationsApiController.cs
index c1c7cb698..7053a5acc 100644
--- a/src/Yavsc.Api/Controllers/Administration/NotificationsApiController.cs
+++ b/src/Yavsc.Api/Controllers/Administration/NotificationsApiController.cs
@@ -24,7 +24,7 @@ public sealed class NotificationsApiController : Controller
     public async Task<ActionResult<List<Notification>>> GetCurrentUserNotifications()
     {
         var currentUserId = User.GetUserId();
-        var isAdmin = User.IsInRole(Constants.AdminName);
+        var isAdmin = User.IsInRole(Constants.AdminGroupName);
 
         var dismissedIds = string.IsNullOrWhiteSpace(currentUserId)
             ? new HashSet<long>()
diff --git a/src/Yavsc.Api/Controllers/Administration/ResourceUsageApiController.cs b/src/Yavsc.Api/Controllers/Administration/ResourceUsageApiController.cs
index 295c72a84..0f6af3083 100644
--- a/src/Yavsc.Api/Controllers/Administration/ResourceUsageApiController.cs
+++ b/src/Yavsc.Api/Controllers/Administration/ResourceUsageApiController.cs
@@ -78,7 +78,7 @@ public sealed class ResourceUsageApiController : Controller
     [HttpGet(Constants.ResourceUsageAdminRoute)]
     public async Task<ActionResult<List<ResourceUsageSummary>>> GetAdminOverview()
     {
-        if (!User.IsInRole(Constants.AdminName))
+        if (!User.IsInRole(Constants.AdminGroupName))
         {
             return Forbid();
         }
diff --git a/src/Yavsc.Api/Controllers/Administration/SiteAdministrationApiController.cs b/src/Yavsc.Api/Controllers/Administration/SiteAdministrationApiController.cs
index f42d58a73..cd4352fbe 100644
--- a/src/Yavsc.Api/Controllers/Administration/SiteAdministrationApiController.cs
+++ b/src/Yavsc.Api/Controllers/Administration/SiteAdministrationApiController.cs
@@ -7,7 +7,7 @@ using Yavsc.Api.Services;
 namespace Yavsc.ApiControllers.Administration;
 
 [ApiController]
-[ApiExplorerSettings(GroupName = Constants.Administration)]
+[ApiExplorerSettings(GroupName = "administration")]
 [Authorize("AdministratorOnly")]
 [Route(Constants.APIPrefix + "/administration")]
 [Produces("application/json")]
diff --git a/src/Yavsc.Api/Controllers/Business/BillingController.cs b/src/Yavsc.Api/Controllers/Business/BillingController.cs
index ba1430a44..6d4f77d89 100644
--- a/src/Yavsc.Api/Controllers/Business/BillingController.cs
+++ b/src/Yavsc.Api/Controllers/Business/BillingController.cs
@@ -107,7 +107,7 @@ namespace Yavsc.ApiControllers
              logger.LogWarning("Got bill ack:"+bill.GetIsAcquitted().ToString());
             if (bill is not NominativeServiceCommand { InvoiceEstimateId: not null } invoice)
                 return Conflict(new { Error = "Create the invoice from a signed estimate first." });
-            if (User.GetUserId() != invoice.InvoicePerformerId && !User.IsInRole(Constants.AdminName))
+            if (User.GetUserId() != invoice.InvoicePerformerId && !User.IsInRole(Constants.AdminGroupName))
                 return Forbid();
             return ViewComponent("Bill",new object[] { billingCode, bill, OutputFormat.Pdf, true } );
         }
diff --git a/src/Yavsc.Api/Controllers/Business/EstimateApiController.cs b/src/Yavsc.Api/Controllers/Business/EstimateApiController.cs
index af9c85a8f..ba351ca83 100644
--- a/src/Yavsc.Api/Controllers/Business/EstimateApiController.cs
+++ b/src/Yavsc.Api/Controllers/Business/EstimateApiController.cs
@@ -24,12 +24,12 @@ namespace Yavsc.Controllers
         }
         bool UserIsAdminOrThis(string uid)
         {
-            if (User.IsInRole(Constants.AdminName)) return true;
+            if (User.IsInRole(Constants.AdminGroupName)) return true;
             return uid == User.GetUserId();
         }
         bool UserIsAdminOrInThese(string oid, string uid)
         {
-            if (User.IsInRole(Constants.AdminName)) return true;
+            if (User.IsInRole(Constants.AdminGroupName)) return true;
             var cuid = User.GetUserId();
             return cuid == uid || cuid == oid;
         }
@@ -79,7 +79,7 @@ namespace Yavsc.Controllers
                 return BadRequest();
             }
             var uid = User.GetUserId();
-            if (!User.IsInRole(Constants.AdminName))
+            if (!User.IsInRole(Constants.AdminGroupName))
             {
                 if (uid != estimate.OwnerId)
                 {
@@ -115,7 +115,7 @@ namespace Yavsc.Controllers
             var uid = User.GetUserId();
             if (estimate.OwnerId == null) estimate.OwnerId = uid;
 
-            if (!User.IsInRole(Constants.AdminName))
+            if (!User.IsInRole(Constants.AdminGroupName))
             {
                 if (uid != estimate.OwnerId)
                 {
@@ -185,7 +185,7 @@ namespace Yavsc.Controllers
                 return NotFound();
             }
             var uid = User.GetUserId();
-            if (!User.IsInRole(Constants.AdminName))
+            if (!User.IsInRole(Constants.AdminGroupName))
             {
                 if (uid != estimate.OwnerId)
                 {
@@ -285,7 +285,7 @@ namespace Yavsc.Controllers
             if (estimate == null) return NotFound();
 
             var uid = User.GetUserId();
-            if (!User.IsInRole(Constants.AdminName) && uid != estimate.OwnerId)
+            if (!User.IsInRole(Constants.AdminGroupName) && uid != estimate.OwnerId)
                 return new StatusCodeResult(StatusCodes.Status403Forbidden);
 
             if (body == null || body.FileId <= 0)
@@ -319,7 +319,7 @@ namespace Yavsc.Controllers
             if (estimate == null) return NotFound();
 
             var uid = User.GetUserId();
-            if (!User.IsInRole(Constants.AdminName) && uid != estimate.OwnerId)
+            if (!User.IsInRole(Constants.AdminGroupName) && uid != estimate.OwnerId)
                 return new StatusCodeResult(StatusCodes.Status403Forbidden);
 
             var link = _context.EstimateAttachedFiles
diff --git a/src/Yavsc.Api/Controllers/Business/EstimateTemplatesApiController.cs b/src/Yavsc.Api/Controllers/Business/EstimateTemplatesApiController.cs
index 5fc814f4d..748f60cc6 100644
--- a/src/Yavsc.Api/Controllers/Business/EstimateTemplatesApiController.cs
+++ b/src/Yavsc.Api/Controllers/Business/EstimateTemplatesApiController.cs
@@ -63,7 +63,7 @@ namespace Yavsc.Controllers
             }
             var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (estimateTemplate.OwnerId!=uid)
-            if (!User.IsInRole(Constants.AdminName))
+            if (!User.IsInRole(Constants.AdminGroupName))
             return new StatusCodeResult(StatusCodes.Status403Forbidden);
 
             _context.Entry(estimateTemplate).State = EntityState.Modified;
@@ -133,7 +133,7 @@ namespace Yavsc.Controllers
             }
             var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (estimateTemplate.OwnerId!=uid)
-            if (!User.IsInRole(Constants.AdminName))
+            if (!User.IsInRole(Constants.AdminGroupName))
             return new StatusCodeResult(StatusCodes.Status403Forbidden);
 
             _context.EstimateTemplates.Remove(estimateTemplate);
diff --git a/src/Yavsc.Api/Controllers/Business/FrontOfficeApiController.cs b/src/Yavsc.Api/Controllers/Business/FrontOfficeApiController.cs
index 51ea6a2c4..7ce2e14df 100644
--- a/src/Yavsc.Api/Controllers/Business/FrontOfficeApiController.cs
+++ b/src/Yavsc.Api/Controllers/Business/FrontOfficeApiController.cs
@@ -86,7 +86,7 @@ namespace Yavsc.ApiControllers
             if (estimate is null) return NotFound(new { Error = "no estimate linked to this query" });
 
             var uid = User.GetUserId();
-            if (!User.IsInRole(Constants.AdminName)
+            if (!User.IsInRole(Constants.AdminGroupName)
                 && uid != estimate.ClientId && uid != estimate.OwnerId)
                 return Forbid();
 
@@ -117,7 +117,7 @@ namespace Yavsc.ApiControllers
             if (estimate is null) return NotFound(new { Error = "no estimate linked to this query" });
 
             var uid = User.GetUserId();
-            if (!User.IsInRole(Constants.AdminName)
+            if (!User.IsInRole(Constants.AdminGroupName)
                 && uid != estimate.ClientId && uid != estimate.OwnerId)
                 return Forbid();
 
@@ -403,7 +403,7 @@ namespace Yavsc.ApiControllers
             if (isProvider) return (query, ActorRole.Provider, null);
             if (isClient) return (query, ActorRole.Client, null);
 
-            if (User.IsInRole(Constants.AdminName))
+            if (User.IsInRole(Constants.AdminGroupName))
                 return (query, ActorRole.Admin, null);
 
             return (null, ActorRole.None, Forbid());
@@ -453,7 +453,7 @@ namespace Yavsc.ApiControllers
             if (error is not null) return error;
             if (query is null) return BadRequest(new { Error = "query not found" });
 
-            if (role != ActorRole.Client && !User.IsInRole(Constants.AdminName))
+            if (role != ActorRole.Client && !User.IsInRole(Constants.AdminGroupName))
                 return new StatusCodeResult(StatusCodes.Status403Forbidden);
 
             if (body == null || body.FileId <= 0)
@@ -463,7 +463,7 @@ namespace Yavsc.ApiControllers
             var file = await dbContext.UploadedFiles
                 .FirstOrDefaultAsync(f => f.Id == body.FileId, token);
             if (file == null) return BadRequest(new { error = "file not found" });
-            if (file.OwnerId != uid && !User.IsInRole(Constants.AdminName))
+            if (file.OwnerId != uid && !User.IsInRole(Constants.AdminGroupName))
                 return new StatusCodeResult(StatusCodes.Status403Forbidden);
 
             var existing = await dbContext.QueryAttachedFiles
@@ -490,7 +490,7 @@ namespace Yavsc.ApiControllers
             if (error is not null) return error;
             if (query is null) return BadRequest(new { Error = "query not found" });
 
-            if (role != ActorRole.Client && !User.IsInRole(Constants.AdminName))
+            if (role != ActorRole.Client && !User.IsInRole(Constants.AdminGroupName))
                 return new StatusCodeResult(StatusCodes.Status403Forbidden);
 
             var link = await dbContext.QueryAttachedFiles
diff --git a/src/Yavsc.Api/Controllers/Business/HairCutQueryApiController.cs b/src/Yavsc.Api/Controllers/Business/HairCutQueryApiController.cs
index adf03860b..bed63d895 100644
--- a/src/Yavsc.Api/Controllers/Business/HairCutQueryApiController.cs
+++ b/src/Yavsc.Api/Controllers/Business/HairCutQueryApiController.cs
@@ -70,7 +70,7 @@ public class HairCutQueryApiController : Controller
             return NotFound();
         }
 
-        if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminName))
+        if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminGroupName))
         {
             return Forbid();
         }
@@ -141,7 +141,7 @@ public class HairCutQueryApiController : Controller
         }
 
         var uid = User.GetUserId();
-        if (existing.ClientId != uid && !User.IsInRole(Constants.AdminName))
+        if (existing.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
         {
             return Forbid();
         }
@@ -185,7 +185,7 @@ public class HairCutQueryApiController : Controller
             return NotFound();
         }
 
-        if (query.ClientId != uid && !User.IsInRole(Constants.AdminName))
+        if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
         {
             return Forbid();
         }
@@ -234,4 +234,4 @@ public class HairCutQueryApiController : Controller
             Details = prestation.GetDisplayDetails(),
         };
     }
-}
+}
\ No newline at end of file
diff --git a/src/Yavsc.Api/Controllers/Business/HairMultiCutQueryApiController.cs b/src/Yavsc.Api/Controllers/Business/HairMultiCutQueryApiController.cs
index a4c224583..c6d4205bd 100644
--- a/src/Yavsc.Api/Controllers/Business/HairMultiCutQueryApiController.cs
+++ b/src/Yavsc.Api/Controllers/Business/HairMultiCutQueryApiController.cs
@@ -77,7 +77,7 @@ public class HairMultiCutQueryApiController : Controller
             return NotFound();
         }
 
-        if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminName))
+        if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminGroupName))
         {
             return Forbid();
         }
@@ -152,7 +152,7 @@ public class HairMultiCutQueryApiController : Controller
         }
 
         var uid = User.GetUserId();
-        if (existing.ClientId != uid && !User.IsInRole(Constants.AdminName))
+        if (existing.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
         {
             return Forbid();
         }
@@ -200,7 +200,7 @@ public class HairMultiCutQueryApiController : Controller
             return NotFound();
         }
 
-        if (query.ClientId != uid && !User.IsInRole(Constants.AdminName))
+        if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
         {
             return Forbid();
         }
@@ -285,4 +285,4 @@ public class HairMultiCutQueryApiController : Controller
 
         return query;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Yavsc.Api/Controllers/Business/InvoicesController.cs b/src/Yavsc.Api/Controllers/Business/InvoicesController.cs
index 561909556..737cef2a9 100644
--- a/src/Yavsc.Api/Controllers/Business/InvoicesController.cs
+++ b/src/Yavsc.Api/Controllers/Business/InvoicesController.cs
@@ -39,7 +39,7 @@ public sealed class InvoicesController(IInvoicingService invoices, ILogger<Invoi
     public Task<ActionResult<InvoiceResponse>> VerifyPayPal(long commandId, VerifyInvoicePayPalRequest request, CancellationToken ct)
         => ExecuteAsync(() => invoices.VerifyPayPalAsync(commandId, request.TransactionId, User.GetUserId(), IsAdmin, ct));
 
-    private bool IsAdmin => User.IsInRole(Constants.AdminName);
+    private bool IsAdmin => User.IsInRole(Constants.AdminGroupName);
 
     private async Task<ActionResult<InvoiceResponse>> ExecuteAsync(Func<Task<InvoiceResponse>> action, bool created = false)
     {
diff --git a/src/Yavsc.Api/Controllers/Business/RdvQueryApiController.cs b/src/Yavsc.Api/Controllers/Business/RdvQueryApiController.cs
index c041a6257..0b5b08222 100644
--- a/src/Yavsc.Api/Controllers/Business/RdvQueryApiController.cs
+++ b/src/Yavsc.Api/Controllers/Business/RdvQueryApiController.cs
@@ -62,7 +62,7 @@ public class RdvQueryApiController : Controller
             return NotFound();
         }
 
-        if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminName))
+        if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminGroupName))
         {
             return Forbid();
         }
@@ -157,7 +157,7 @@ public class RdvQueryApiController : Controller
             return NotFound();
         }
 
-        if (existing.ClientId != uid && !User.IsInRole(Constants.AdminName))
+        if (existing.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
         {
             return Forbid();
         }
@@ -222,7 +222,7 @@ public class RdvQueryApiController : Controller
             return NotFound();
         }
 
-        if (query.ClientId != uid && !User.IsInRole(Constants.AdminName))
+        if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
         {
             return Forbid();
         }
diff --git a/src/Yavsc.Api/Controllers/PostRateApiController.cs b/src/Yavsc.Api/Controllers/PostRateApiController.cs
index 59a935119..83e2bee18 100644
--- a/src/Yavsc.Api/Controllers/PostRateApiController.cs
+++ b/src/Yavsc.Api/Controllers/PostRateApiController.cs
@@ -35,7 +35,7 @@ namespace Yavsc.Controllers
 
             var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (blogpost.AuthorId!=uid)
-                if (!User.IsInRole(Constants.AdminName))
+                if (!User.IsInRole(Constants.AdminGroupName))
                     return BadRequest();
 
             _context.SaveChanges(User.GetUserId());
diff --git a/src/Yavsc.Api/Controllers/Relationship/BlackListApiController.cs b/src/Yavsc.Api/Controllers/Relationship/BlackListApiController.cs
index 2e9bc871f..3a0ca6300 100644
--- a/src/Yavsc.Api/Controllers/Relationship/BlackListApiController.cs
+++ b/src/Yavsc.Api/Controllers/Relationship/BlackListApiController.cs
@@ -49,7 +49,7 @@ namespace Yavsc.Controllers
         {
             var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (uid != blackListed.OwnerId)
-                if (!User.IsInRole(Constants.AdminName))
+                if (!User.IsInRole(Constants.AdminGroupName))
                     if (!User.IsInRole(Constants.FrontOfficeGroupName))
                         return false;
             return true;
diff --git a/src/Yavsc.Api/Controllers/Relationship/ChatRoomAccessApiController.cs b/src/Yavsc.Api/Controllers/Relationship/ChatRoomAccessApiController.cs
index a4ec6dfdd..fba8bd432 100644
--- a/src/Yavsc.Api/Controllers/Relationship/ChatRoomAccessApiController.cs
+++ b/src/Yavsc.Api/Controllers/Relationship/ChatRoomAccessApiController.cs
@@ -46,7 +46,7 @@ namespace Yavsc.Controllers
 
             var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (uid != chatRoomAccess.UserId && uid != chatRoomAccess.Room.OwnerId
-             && ! User.IsInMsRole(Constants.AdminName))
+             && ! User.IsInMsRole(Constants.AdminGroupName))
 
             {
                 ModelState.AddModelError("UserId","get refused");
@@ -72,7 +72,7 @@ namespace Yavsc.Controllers
             }
             var room = _context.ChatRoom.First(channel => channel.Name == chatRoomAccess.ChannelName );
 
-            if (uid != room.OwnerId && ! User.IsInMsRole(Constants.AdminName))
+            if (uid != room.OwnerId && ! User.IsInMsRole(Constants.AdminGroupName))
             {
                 ModelState.AddModelError("ChannelName", "access put refused");
                 return BadRequest(ModelState);
@@ -110,7 +110,7 @@ namespace Yavsc.Controllers
 
             var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var room = _context.ChatRoom.First(channel => channel.Name == chatRoomAccess.ChannelName );
-            if (room == null || (uid != room.OwnerId && ! User.IsInMsRole(Constants.AdminName)))
+            if (room == null || (uid != room.OwnerId && ! User.IsInMsRole(Constants.AdminGroupName)))
             {
                 ModelState.AddModelError("ChannelName", "access post refused");
                 return BadRequest(ModelState);
@@ -154,7 +154,7 @@ namespace Yavsc.Controllers
 
             var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var room = _context.ChatRoom.First(channel => channel.Name == chatRoomAccess.ChannelName );
-            if (room == null || (uid != room.OwnerId  && chatRoomAccess.UserId != uid && ! User.IsInMsRole(Constants.AdminName)))
+            if (room == null || (uid != room.OwnerId  && chatRoomAccess.UserId != uid && ! User.IsInMsRole(Constants.AdminGroupName)))
             {
                 ModelState.AddModelError("UserId", "access drop refused");
                 return BadRequest(ModelState);
diff --git a/src/Yavsc.Api/Controllers/Relationship/ChatRoomApiController.cs b/src/Yavsc.Api/Controllers/Relationship/ChatRoomApiController.cs
index f3a0075c5..d0f712b34 100644
--- a/src/Yavsc.Api/Controllers/Relationship/ChatRoomApiController.cs
+++ b/src/Yavsc.Api/Controllers/Relationship/ChatRoomApiController.cs
@@ -136,7 +136,7 @@ namespace Yavsc.Controllers
 
             if (User.GetUserId() != chatRoom.OwnerId )
             {
-                if (!User.IsInMsRole(Constants.AdminName))
+                if (!User.IsInMsRole(Constants.AdminGroupName))
                     return BadRequest(new {error = "OwnerId"});
             }
 
diff --git a/src/Yavsc.Api/Program.cs b/src/Yavsc.Api/Program.cs
index 132cb26c7..03afcf58f 100644
--- a/src/Yavsc.Api/Program.cs
+++ b/src/Yavsc.Api/Program.cs
@@ -63,7 +63,7 @@ internal class Program
                 {
                     policy
                         .RequireAuthenticatedUser()
-                        .RequireClaim(Constants.RoleClaimType, Constants.AdminName);
+                        .RequireClaim(Constants.RoleClaimType, Constants.AdminGroupName);
                 });
             })
             .AddYavscCors(builder.Configuration)
diff --git a/src/Yavsc.Api/Services/AdministrationService.cs b/src/Yavsc.Api/Services/AdministrationService.cs
index f109a5648..65e8e4a72 100644
--- a/src/Yavsc.Api/Services/AdministrationService.cs
+++ b/src/Yavsc.Api/Services/AdministrationService.cs
@@ -32,7 +32,7 @@ public sealed partial class AdministrationService(
 
     public async Task<AdministrationSummary> GetSummaryAsync(CancellationToken ct)
         => new(await db.Users.CountAsync(ct),
-            (await users.GetUsersInRoleAsync(Constants.AdminName)).Count,
+            (await users.GetUsersInRoleAsync(Constants.AdminGroupName)).Count,
             typeof(AdministrationService).Assembly.GetName().ToString(), System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription);
 
     public async Task<IReadOnlyList<AdministrationRole>> GetRolesAsync(CancellationToken ct)
@@ -46,7 +46,7 @@ public sealed partial class AdministrationService(
 
     public async Task EnsureRolesAsync(CancellationToken ct)
     {
-        foreach (var name in new[] { Constants.AdminName, Constants.StarGroupName, Constants.PerformerGroupName,
+        foreach (var name in new[] { Constants.AdminGroupName, Constants.StarGroupName, Constants.PerformerGroupName,
                      Constants.FrontOfficeGroupName, Constants.StarHunterGroupName, Constants.BlogModeratorGroupName })
         {
             ct.ThrowIfCancellationRequested();
@@ -73,7 +73,7 @@ public sealed partial class AdministrationService(
             CheckIdentity(await users.AddToRoleAsync(user, role.Name!));
         else if (!member && alreadyMember)
         {
-            if (role.Name == Constants.AdminName &&
+            if (role.Name == Constants.AdminGroupName &&
                 (await users.GetUsersInRoleAsync(role.Name)).Count <= 1)
                 throw Conflict("Impossible de retirer le dernier administrateur.");
             CheckIdentity(await users.RemoveFromRoleAsync(user, role.Name!));
diff --git a/src/Yavsc.Api/Services/AdministrationServiceCollectionExtensions.cs b/src/Yavsc.Api/Services/AdministrationServiceCollectionExtensions.cs
index c8762fbe8..447595cec 100644
--- a/src/Yavsc.Api/Services/AdministrationServiceCollectionExtensions.cs
+++ b/src/Yavsc.Api/Services/AdministrationServiceCollectionExtensions.cs
@@ -9,8 +9,8 @@ public static class AdministrationServiceCollectionExtensions
         services.AddHttpContextAccessor();
         services.AddScoped<IAdministrationService, AdministrationService>();
         services.AddScoped<AdministrationExceptionFilter>();
-        services.AddOpenApi(Constants.Administration, options =>
-            options.ShouldInclude = description => description.GroupName == Constants.Administration);
+        services.AddOpenApi("administration", options =>
+            options.ShouldInclude = description => description.GroupName == "administration");
         return services;
     }
 }
diff --git a/src/Yavsc.Blogs/Controllers/FileSystemApiController.cs b/src/Yavsc.Blogs/Controllers/FileSystemApiController.cs
index 50754ff00..eb4433d4f 100644
--- a/src/Yavsc.Blogs/Controllers/FileSystemApiController.cs
+++ b/src/Yavsc.Blogs/Controllers/FileSystemApiController.cs
@@ -216,7 +216,7 @@ namespace Yavsc.Blogs.Controllers
         // autorisés comme pour le reste du workflow.
         bool CanReadFile(UploadedFile file, string uid)
         {
-            if (User.IsInRole(Constants.AdminName)) return true;
+            if (User.IsInRole(Constants.AdminGroupName)) return true;
             if (file.OwnerId == uid) return true;
 
             if (dbContext.EstimateAttachedFiles.Any(a =>
diff --git a/src/Yavsc.Org/Controllers/Administration/AdministrationController.cs b/src/Yavsc.Org/Controllers/Administration/AdministrationController.cs
index ffffeb1cb..88ea81ce8 100644
--- a/src/Yavsc.Org/Controllers/Administration/AdministrationController.cs
+++ b/src/Yavsc.Org/Controllers/Administration/AdministrationController.cs
@@ -56,7 +56,7 @@ namespace Yavsc.Controllers
         {
             // ensure all roles existence
             foreach (string roleName in new string[] {
-                Constants.AdminName,
+                Constants.AdminGroupName,
                 Constants.StarGroupName,
                 Constants.PerformerGroupName,
                 Constants.FrontOfficeGroupName,
@@ -86,12 +86,13 @@ namespace Yavsc.Controllers
         public async Task<IActionResult> Take()
         {
             // If some amdin already exists, make this method disapear
-            var admins = await _userManager.GetUsersInRoleAsync(Constants.AdminName);
+            var admins = await _userManager.GetUsersInRoleAsync(Constants.AdminGroupName);
             if (admins != null && admins.Count > 0)
             {
                 // All is ok, nothing to do here.
-                if (User.IsInMsRole(Constants.AdminName))
+                if (User.IsInMsRole(Constants.AdminGroupName))
                 {
+
                     return Ok(new { message = "you already got it." });
                 }
                 return NotFound();
@@ -115,7 +116,7 @@ namespace Yavsc.Controllers
                 return new BadRequestObjectResult(ModelState);
             }
 
-            var addToRoleResult = await _userManager.AddToRoleAsync(user, Constants.AdminName);
+            var addToRoleResult = await _userManager.AddToRoleAsync(user, Constants.AdminGroupName);
             if (!addToRoleResult.Succeeded)
             {
                 AddErrors(addToRoleResult);
@@ -129,11 +130,11 @@ namespace Yavsc.Controllers
         public async Task<IActionResult> Index()
         {
             var adminCount = await _userManager.GetUsersInRoleAsync(
-                Constants.AdminName);
+                Constants.AdminGroupName);
             var userCount = await _dbContext.Users.CountAsync();
             var youAreAdmin = await _userManager.IsInRoleAsync(
                 await _userManager.FindByIdAsync(User.GetUserId()),
-                Constants.AdminName);
+                Constants.AdminGroupName);
 
             var roles = await _roleManager.Roles.Select(x => new RoleInfo
             {
diff --git a/src/Yavsc.Org/Controllers/Communicating/AnnouncesController.cs b/src/Yavsc.Org/Controllers/Communicating/AnnouncesController.cs
index 06ed3393c..d2aefcdb5 100644
--- a/src/Yavsc.Org/Controllers/Communicating/AnnouncesController.cs
+++ b/src/Yavsc.Org/Controllers/Communicating/AnnouncesController.cs
@@ -57,7 +57,7 @@ namespace Yavsc.Controllers
         }
         private async Task SetupView(Announce announce)
         {
-            ViewBag.IsAdmin = User.IsInMsRole(Constants.AdminName);
+            ViewBag.IsAdmin = User.IsInMsRole(Constants.AdminGroupName);
             ViewBag.IsPerformer = User.IsInMsRole(Constants.PerformerGroupName);
             ViewBag.AllowEdit = announce==null || announce.Id<=0 || !_authorizationService.AuthorizeAsync(User,announce,new EditPermission()).IsFaulted;
             List<SelectListItem> dl = new List<SelectListItem>();
@@ -80,7 +80,7 @@ namespace Yavsc.Controllers
             if (ModelState.IsValid)
             {
                 // Only allow admin to create corporate annonces
-                if (announce.For == Reason.Corporate && ! User.IsInMsRole(Constants.AdminName))
+                if (announce.For == Reason.Corporate && ! User.IsInMsRole(Constants.AdminGroupName))
                 {
                     ModelState.AddModelError("For", _localizer["YourNotAdmin"]);
                     return View(announce);
diff --git a/src/Yavsc.Org/Controllers/HomeController.cs b/src/Yavsc.Org/Controllers/HomeController.cs
index f3b0dcad4..ab066ee3b 100644
--- a/src/Yavsc.Org/Controllers/HomeController.cs
+++ b/src/Yavsc.Org/Controllers/HomeController.cs
@@ -50,14 +50,9 @@ namespace Yavsc.Controllers
                 if (clicked == null) clicked = new long[0];
             }
             else clicked = _dbContext.DismissClicked.Where(d => d.UserId == uid).Select(d => d.NotificationId).ToArray();
-            var isAdmin = User.IsInRole(Constants.AdminName);
             var notes = _dbContext.Notification.Where(
                 n => !clicked.Contains(n.Id)
-            ).Where(n =>
-                string.IsNullOrWhiteSpace(n.Target)
-                || (n.Target != null && n.Target.StartsWith("pub/"))
-                || (!string.IsNullOrWhiteSpace(uid) && n.Target == $"user/{uid}")
-                || (isAdmin && n.Target == Constants.Administration));
+            );
             if (notes.Any()) this.Notify(notes);
 
             var toShow = _dbContext.Activities
diff --git a/src/Yavsc.Org/Controllers/Musical/InstrumentationController.cs b/src/Yavsc.Org/Controllers/Musical/InstrumentationController.cs
index 604e5175b..70faa88b0 100644
--- a/src/Yavsc.Org/Controllers/Musical/InstrumentationController.cs
+++ b/src/Yavsc.Org/Controllers/Musical/InstrumentationController.cs
@@ -63,7 +63,7 @@ namespace Yavsc.Controllers
             var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (ModelState.IsValid)
             {
-                if (model.UserId != uid) if (!User.IsInMsRole(Constants.AdminName))
+                if (model.UserId != uid) if (!User.IsInMsRole(Constants.AdminGroupName))
                     return new ChallengeResult();
 
                 _context.Instrumentation.Add(model);
@@ -81,7 +81,7 @@ namespace Yavsc.Controllers
             {
                 return NotFound();
             }
-            if (id != uid) if (!User.IsInMsRole(Constants.AdminName))
+            if (id != uid) if (!User.IsInMsRole(Constants.AdminGroupName))
                     return new ChallengeResult();
             Instrumentation musicianSettings = await _context.Instrumentation.SingleAsync(m => m.UserId == id);
             if (musicianSettings == null)
@@ -97,7 +97,7 @@ namespace Yavsc.Controllers
         public async Task<IActionResult> Edit(Instrumentation musicianSettings)
         {
             var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
-            if (musicianSettings.UserId != uid) if (!User.IsInMsRole(Constants.AdminName))
+            if (musicianSettings.UserId != uid) if (!User.IsInMsRole(Constants.AdminGroupName))
                     return new ChallengeResult();
             if (ModelState.IsValid)
             {
@@ -123,7 +123,7 @@ namespace Yavsc.Controllers
                 return NotFound();
             }
             var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
-            if (musicianSettings.UserId != uid) if (!User.IsInMsRole(Constants.AdminName))
+            if (musicianSettings.UserId != uid) if (!User.IsInMsRole(Constants.AdminGroupName))
                     return new ChallengeResult();
             return View(musicianSettings);
         }
@@ -136,7 +136,7 @@ namespace Yavsc.Controllers
             Instrumentation musicianSettings = await _context.Instrumentation.SingleAsync(m => m.UserId == id);
 
             var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
-            if (musicianSettings.UserId != uid) if (!User.IsInMsRole(Constants.AdminName))
+            if (musicianSettings.UserId != uid) if (!User.IsInMsRole(Constants.AdminGroupName))
                     return new ChallengeResult();
 
 
diff --git a/src/Yavsc.Org/Extensions/HostingExtensions.cs b/src/Yavsc.Org/Extensions/HostingExtensions.cs
index 38ce39fb1..ff4a657dd 100644
--- a/src/Yavsc.Org/Extensions/HostingExtensions.cs
+++ b/src/Yavsc.Org/Extensions/HostingExtensions.cs
@@ -263,14 +263,14 @@ public static class HostingExtensions
                 policy
                     .RequireAuthenticatedUser()
                     .RequireClaim(Constants.RoleClaimType,
-                    new string[] { Constants.PerformerGroupName, Constants.AdminName })
+                    new string[] { Constants.PerformerGroupName, Constants.AdminGroupName })
                     ;
             });
             options.AddPolicy("AdministratorOnly", policy =>
             {
                 _ = policy
                     .RequireAuthenticatedUser()
-                    .RequireClaim(Constants.RoleClaimType, Constants.AdminName);
+                    .RequireClaim(Constants.RoleClaimType, Constants.AdminGroupName);
             });
 
             options.AddPolicy("FrontOffice", policy => policy.RequireRole(Constants.FrontOfficeGroupName));
diff --git a/src/Yavsc.Org/Views/Shared/_LoginPartial.cshtml b/src/Yavsc.Org/Views/Shared/_LoginPartial.cshtml
index 0c13e3c41..7bfa2a3f9 100644
--- a/src/Yavsc.Org/Views/Shared/_LoginPartial.cshtml
+++ b/src/Yavsc.Org/Views/Shared/_LoginPartial.cshtml
@@ -16,7 +16,7 @@
                 <li><a class="dropdown-item @PageHelpers.ActivePage(ViewContext, "Feature")" asp-controller="Feature" asp-action="Index">Features</a></li>
             </ul>
         </li>
-        @if (User.IsInMsRole(Constants.AdminName)) {
+        @if (User.IsInMsRole(Constants.AdminGroupName)) {
         <li class="nav-item dropdown">
             <a class="nav-link dropdown-toggle @PageHelpers.ActivePageAny(ViewContext, administrationControllers)" href="#" id="dropdown05" data-bs-toggle="dropdown" aria-expanded="false">
                 Administration
diff --git a/src/Yavsc.Server/Hubs/ChatHub.cs b/src/Yavsc.Server/Hubs/ChatHub.cs
index f2a1d08bc..b9e54496c 100644
--- a/src/Yavsc.Server/Hubs/ChatHub.cs
+++ b/src/Yavsc.Server/Hubs/ChatHub.cs
@@ -80,7 +80,7 @@ namespace Yavsc.Server.Hubs
             var userId = _dbContext.Users.First(u => u.UserName == userName).Id;
 
             await Clients.Group(ChatHubConstants.HubGroupFollowingPrefix + userId).SendAsync("notifyUser", NotificationTypes.Connected, userName, null);
-            isCop = Context.User.IsInMsRole(Constants.AdminName);
+            isCop = Context.User.IsInMsRole(Constants.AdminGroupName);
             if (isCop)
             {
                 await Groups.AddToGroupAsync(Context.ConnectionId, ChatHubConstants.HubGroupCops);
@@ -232,7 +232,7 @@ namespace Yavsc.Server.Hubs
             throw new NotImplementedException();
         }
 
-        [Authorize(Constants.AdminName)]
+        [Authorize(Constants.AdminGroupName)]
         public void GLine(string userName, string reason)
         {
             if (!InputValidator.ValidateUserName(userName)) return;
@@ -330,7 +330,7 @@ namespace Yavsc.Server.Hubs
             var identityUserName = Context.User.GetUserName();
 
             if (userName[0] != '?' && Context.User != null)
-                if (!Context.User.IsInMsRole(Constants.AdminName))
+                if (!Context.User.IsInMsRole(Constants.AdminGroupName))
                 {
 
                     var bl = _dbContext.BlackListed
diff --git a/src/test/Yavsc.Api.Tests/Fixtures/ApiWebServerFixture.cs b/src/test/Yavsc.Api.Tests/Fixtures/ApiWebServerFixture.cs
index 9e75c2210..68d14c57b 100644
--- a/src/test/Yavsc.Api.Tests/Fixtures/ApiWebServerFixture.cs
+++ b/src/test/Yavsc.Api.Tests/Fixtures/ApiWebServerFixture.cs
@@ -90,7 +90,7 @@ public sealed class ApiWebServerFixture : WebHostFixture
             options.AddPolicy("AdministratorOnly", policy =>
             {
                 policy.RequireAuthenticatedUser();
-                policy.RequireClaim(Yavsc.Constants.RoleClaimType, Yavsc.Constants.AdminName);
+                policy.RequireClaim(Yavsc.Constants.RoleClaimType, Yavsc.Constants.AdminGroupName);
             });
         });
 
diff --git a/src/test/Yavsc.Api.Tests/HomeControllerTests.cs b/src/test/Yavsc.Api.Tests/HomeControllerTests.cs
index d119bc797..a5706dc5f 100644
--- a/src/test/Yavsc.Api.Tests/HomeControllerTests.cs
+++ b/src/test/Yavsc.Api.Tests/HomeControllerTests.cs
@@ -6,10 +6,8 @@ using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
-using Yavsc.Abstract.Models.Messaging;
 using Yavsc.Api.Test.Fixtures;
 using Yavsc.Controllers;
-using Yavsc.Models;
 using Yavsc.Models.Workflow;
 
 namespace Yavsc.Api.Test;
@@ -59,106 +57,6 @@ public sealed class HomeControllerTests : IClassFixture<ApiWebServerFixture>
         Assert.DoesNotContain(model, a => a.Code == "ghost");
     }
 
-    [Fact]
-    public async Task Index_does_not_show_performer_notification_to_anonymous_visitors()
-    {
-        _fixture.ResetAndSeedActivityGraph();
-        using var scope = _fixture.Services.CreateScope();
-        var db = scope.ServiceProvider.GetRequiredService<Yavsc.Models.ApplicationDbContext>();
-        db.Notification.AddRange(
-            Note("Rendez-vous professionnel", "user/alice"),
-            Note("Annonce publique", "pub/all"));
-        await db.SaveChangesAsync();
-
-        var controller = CreateHomeController(db, new ClaimsPrincipal(new ClaimsIdentity()));
-        controller.ControllerContext.HttpContext.Session = new TestSession();
-
-        await controller.Index(id: null);
-
-        object notifyValue = controller.ViewBag.Notify;
-        var notifications = Assert.IsAssignableFrom<IEnumerable<Notification>>(notifyValue);
-        Assert.Equal("Annonce publique", Assert.Single(notifications).title);
-    }
-
-    [Fact]
-    public async Task Index_shows_performer_notification_only_to_its_target_user()
-    {
-        _fixture.ResetAndSeedActivityGraph();
-        using var scope = _fixture.Services.CreateScope();
-        var db = scope.ServiceProvider.GetRequiredService<Yavsc.Models.ApplicationDbContext>();
-        db.Notification.AddRange(
-            Note("Rendez-vous professionnel", "user/alice"),
-            Note("Autre rendez-vous", "user/bob"),
-            Note("Annonce publique", "pub/all"));
-        await db.SaveChangesAsync();
-
-        var controller = CreateHomeController(db, UserPrincipal("bob"));
-        await controller.Index(id: null);
-
-        object notifyValue = controller.ViewBag.Notify;
-        var notifications = Assert.IsAssignableFrom<IEnumerable<Notification>>(notifyValue);
-        Assert.Equal(new[] { "Autre rendez-vous", "Annonce publique" },
-            notifications.Select(notification => notification.title));
-
-        var performerController = CreateHomeController(db, UserPrincipal("alice"));
-        await performerController.Index(id: null);
-
-        object performerNotifyValue = performerController.ViewBag.Notify;
-        var performerNotifications = Assert.IsAssignableFrom<IEnumerable<Notification>>(performerNotifyValue);
-        Assert.Equal(new[] { "Rendez-vous professionnel", "Annonce publique" },
-            performerNotifications.Select(notification => notification.title));
-    }
-
-    private static HomeController CreateHomeController(
-        Yavsc.Models.ApplicationDbContext db,
-        ClaimsPrincipal user)
-    {
-        var controller = new HomeController(
-            NullLogger<HomeController>.Instance,
-            localizer: null!,
-            context: db,
-            settingsOptions: Options.Create(new SiteSettings()),
-            env: new TestEnvironment());
-
-        controller.ControllerContext = new ControllerContext
-        {
-            HttpContext = new DefaultHttpContext { User = user }
-        };
-        return controller;
-    }
-
-    private static ClaimsPrincipal UserPrincipal(string userId)
-        => new(new ClaimsIdentity(new[]
-        {
-            new Claim("sub", userId),
-            new Claim(ClaimTypes.NameIdentifier, userId)
-        }, "Bearer"));
-
-    private static Notification Note(string title, string target)
-        => new()
-        {
-            title = title,
-            body = "Corps",
-            click_action = "Fermer",
-            Target = target
-        };
-
-    private sealed class TestSession : ISession
-    {
-        private readonly Dictionary<string, byte[]> _values = new();
-
-        public bool IsAvailable => true;
-        public string Id => "home-controller-test-session";
-        public IEnumerable<string> Keys => _values.Keys;
-
-        public void Clear() => _values.Clear();
-        public Task CommitAsync(CancellationToken cancellationToken = default) => Task.CompletedTask;
-        public Task LoadAsync(CancellationToken cancellationToken = default) => Task.CompletedTask;
-        public void Remove(string key) => _values.Remove(key);
-        public void Set(string key, byte[] value) => _values[key] = value;
-        public bool TryGetValue(string key, out byte[] value) => _values.TryGetValue(key, out value!);
-    }
-
     private sealed class TestEnvironment : IWebHostEnvironment
     {
         public string ApplicationName { get; set; } = "Yavsc.Api.Test";
diff --git a/src/test/Yavsc.Api.Tests/InvoiceApiTests.cs b/src/test/Yavsc.Api.Tests/InvoiceApiTests.cs
index 4a1c69c52..aecafe2d2 100644
--- a/src/test/Yavsc.Api.Tests/InvoiceApiTests.cs
+++ b/src/test/Yavsc.Api.Tests/InvoiceApiTests.cs
@@ -414,7 +414,7 @@ public sealed class InvoiceApiTests(ApiWebServerFixture fixture) : IClassFixture
         using var admin = Client();
         admin.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer",
             TestTokenIssuer.Issue("alice", "api", extraClaims:
-            [new System.Security.Claims.Claim(Constants.RoleClaimType, Constants.AdminName)]));
+            [new System.Security.Claims.Claim(Constants.RoleClaimType, Constants.AdminGroupName)]));
         var response = await admin.GetAsync("/openapi/invoicing.json", Ct);
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         var json = await response.Content.ReadAsStringAsync(Ct);
diff --git a/src/test/Yavsc.Api.Tests/PodcastControllerTests.cs b/src/test/Yavsc.Api.Tests/PodcastControllerTests.cs
index fa623500f..7616903f9 100644
--- a/src/test/Yavsc.Api.Tests/PodcastControllerTests.cs
+++ b/src/test/Yavsc.Api.Tests/PodcastControllerTests.cs
@@ -89,7 +89,7 @@ public sealed class PodcastControllerTests(ApiWebServerFixture fixture) : IClass
         using var admin = Client("podcast-admin");
         admin.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer",
             TestTokenIssuer.Issue("podcast-admin", "api",
-                extraClaims: new[] { new Claim(Constants.RoleClaimType, Constants.AdminName) }));
+                extraClaims: new[] { new Claim(Constants.RoleClaimType, Constants.AdminGroupName) }));
         using var response = await admin.GetAsync("/openapi/podcasts.json", _ct);
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         using var document = JsonDocument.Parse(await response.Content.ReadAsStringAsync(_ct));
diff --git a/src/test/Yavsc.Api.Tests/ResourceUsageApiControllerTests.cs b/src/test/Yavsc.Api.Tests/ResourceUsageApiControllerTests.cs
index 836ab7929..0d1df8181 100644
--- a/src/test/Yavsc.Api.Tests/ResourceUsageApiControllerTests.cs
+++ b/src/test/Yavsc.Api.Tests/ResourceUsageApiControllerTests.cs
@@ -143,7 +143,7 @@ public sealed class ResourceUsageApiControllerTests : IClassFixture<ApiWebServer
                 title = "Admin",
                 body = "Restricted to administrators",
                 click_action = "/admin",
-                Target = Constants.Administration,
+                Target = "administration",
             });
         await db.SaveChangesAsync();
 
@@ -172,7 +172,7 @@ public sealed class ResourceUsageApiControllerTests : IClassFixture<ApiWebServer
             "api",
             new[]
             {
-                new Claim(Yavsc.Constants.RoleClaimType, Yavsc.Constants.AdminName)
+                new Claim(Yavsc.Constants.RoleClaimType, Yavsc.Constants.AdminGroupName)
             });
 
         var response = await adminHttp.GetAsync("/api/v1/resource-usage/admin", TestContext.Current.CancellationToken);