Removed max events stuff from earlier merge