Remove two features added upstream
Importing the full library would double the jar size... its way too large. So lets just import the basic int/long based collections to then use to improve performance on these kind of collections.
This simplifies new event calling by reducing the diff to actually fire the event and check for cancelled state.
