remove button hide logic changed