Removed unused references and other nits.