edit javadoc and remove commented code.
fix issue where events from API overwrote clientIds of existing events.
refactor streams callbacks
remove SupervisorEventsCallback because it is useless