EPD-84: Cleanup