Removed overwriting of `addEventListener` and `removeEventListener`