Further cleanups to Intro.