remove the need for cleanup job per event