Clean up "Events"
Clean up conf & structure