EPD-18: Purge eeins and esd + various clean-up