More setup cleanup