removed demo code and updated all the events so that they now actually hold context