fixed click handler removal