GEN-108 Make clean CRUD for events