Removed redundant event and handler
removed redundant events