Event dispatcher removeEventListener fix and default class instead of typedef