added pre-setup cleanup