Continue removing MaskedClient