Adds subscriber cleanup back into ingestion
Merge pull request #613 from lukecampbell/ingestion_retry

Adds subscriber cleanup back into ingestion