More removal of deprecated methods.