Got rid of some deprecated methods.