Removed some unrequired events