removed redundant event handlers