Remove dependency on Services from ETL Loader