Removed old code, fixed issue in storyboard