More cleanup on introduction