Storyboard modification, cleanup.