Remove redundant event handlers