some cleanup
changes to event service