Remove TestEventsLimit(), and minor cleanups Upstream-commit: c753095bf331b5b8904cd58a2072c93a9b815141 Component: engine