More cleanup of Storyboard.