Get rid of deprecated fields