Removed unnecessary cleanup in isEventSupported