Removed unneccessary EventHandlers