Removed embryonic EventHandler class