Remove slow ingestion code and general clean-up of unused storage code.