Remove Op also needs to be transformed