Better piece removal logic