Get rid of deprecated operators