Includes an additional deprecation and rationalizing the beginning sections.