removed redundant event listeners