More robust teardown

If core infrastructure was created, but ssh proxy not configured, teardown
didn't work. This could happen, for example, when there was an issue with core
deployment.