remove events stuff, as won't make it into 2.3 / will stay as a plugin