EMD Cleanup