EventSystem: remove unused code