Get rid of deprecated methods