more setup cleanup