Refactored subscriber removal