remove unused Event implementation
merge?