more removal of unnecessary stuff, more work on events