Had problems on another project where the events were hanging around, which was causing strange behaviour that was very difficult to debug, this seemed to fix it