Removed redundant event handler