More work on EnviData removal