minor initial setup cleanup