Storyboard cleanup