Removed support for multiple event registrations in one call
Cleanup