More tidy-up prior to running EmrEtlRunner