Removing ingestion/non-groupby related cruft