Cleanup with the new ETL features