Removed check for events_registered as it is not required