More Storyboard cleanup