continued cleanup of setup process