EPD-178: Cleanup