Dropped some deprecated methods