some more changes to get from eu to ap
teardown script modified