Porting in the working variables from the EG-ZC-T3 site
Removed the inclusion of the site-specific variables, which was causing misconfigurations at several places.