Add ematch cleanup
2 files changed