WOrk on cleaning up data ingest