Removed old subscription management