Get rid of deprecated variables.