Cleanup things. More performant event dispatching