more cleanup on reverse_operator