EPD-83: cleanup