Adds subscriber cleanup back into ingestion