Removed un-needed event handler