Remove un-utilized event handlers