- Clean up a bunch of render events (#6444)