Update to remove legacy methods and values.