Avoid use of deprecated/removed symbols.