remove base Event class dependency