Clean up
Merge pull request #1 from marlin-gingerich/kluster_events

Clean up