Removed references on derecated classes and methods.