Cleanup for D.