Remove stale subscriptions from local endpoint

Fixes #3563