Storyboard clean up