General cleanup throughout storyboard.