add cleanup method to event consumer
reswig